Wifi 8099 (#579)

* Added upstream_resource

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Updated lab_info.json

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Added upstream_resource

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Updated lab_info.json

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

libs/lanforge/lf_tests.py

@@ -106,6 +106,7 @@ class RunTest:
             self.fiveg_radios = configuration_data['traffic_generator']['details']["5G-Radio"]
             self.ax_radios = configuration_data['traffic_generator']['details']["AX-Radio"]
             self.upstream_port = configuration_data['traffic_generator']['details']["upstream"].split(".")[2]
+            self.upstream_resource = configuration_data['traffic_generator']['details']["upstream"].split(".")[1]
             self.twog_prefix = configuration_data['traffic_generator']['details']["2.4G-Station-Name"]
             self.fiveg_prefix = configuration_data['traffic_generator']['details']["5G-Station-Name"]
             self.ax_prefix = configuration_data['traffic_generator']['details']["AX-Station-Name"]
@@ -138,7 +139,7 @@ class RunTest:
         self.staConnect = StaConnect2(self.lanforge_ip, self.lanforge_port, debug_=self.debug)
 
         self.staConnect.sta_mode = 0
-        self.staConnect.upstream_resource = 1
+        self.staConnect.upstream_resource = self.upstream_resource
         if mode == "BRIDGE":
             self.staConnect.upstream_port = self.upstream_port
         elif mode == "NAT":
@@ -286,7 +287,9 @@ class RunTest:
                                     sta_list=station_name, vap=False, _debug_on=self.debug)
 
         self.eap_connect.station_profile.sta_mode = 0
-        self.eap_connect.upstream_resource = 1
+        self.eap_connect.upstream_resource = self.upstream_resource
+        self.eap_connect.l3_cx_obj_udp.upstream_resource = self.upstream_resource
+        self.eap_connect.l3_cx_obj_tcp.upstream_resource = self.upstream_resource
         if mode == "BRIDGE":
             self.eap_connect.l3_cx_obj_udp.upstream = self.upstream_port
             self.eap_connect.l3_cx_obj_tcp.upstream = self.upstream_port

tests/lab_info.json

@@ -9,16 +9,16 @@
         },
         "access_point": [
             {
-                "model": "edgecore_ecw5410",
+                "model": "edgecore_eap102",
-                "mode": "wifi5",
+                "mode": "wifi6",
-                "serial": "3c2c99f44e77",
+                "serial": "903cb3bd7299",
                 "jumphost": true,
                 "ip": "10.28.3.100",
                 "username": "lanforge",
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP1",
-                "version": "release-latest"
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -56,7 +56,7 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP2",
-                "version": "release-latest"
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -94,7 +94,7 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP3",
-                "version": "release-latest"
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -132,7 +132,7 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP6",
-                "version": "release-latest"
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -170,7 +170,45 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP5",
-                "version": "release-latest"
+                "version": "next-latest"
+            }
+        ],
+        "traffic_generator": {
+            "name": "lanforge",
+            "details": {
+                "ip": "10.28.3.12",
+                "port": 8080,
+                "ssh_port": 22,
+                "2.4G-Radio": ["1.1.wiphy4"],
+                "5G-Radio": ["1.1.wiphy5"],
+                "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"],
+                "upstream": "1.1.eth2",
+                "upstream_subnet": "10.28.2.1/24",
+                "uplink": "1.1.eth3",
+                "2.4G-Station-Name": "wlan0",
+                "5G-Station-Name": "wlan0",
+                "AX-Station-Name": "ax"
+            }
+        }
+    },
+    "basic-04a": {
+        "controller": {
+            "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001",
+            "username": "tip@ucentral.com",
+            "password": "OpenWifi%123"
+        },
+        "access_point": [
+            {
+                "model": "hfcl_ion4xi",
+                "mode": "wifi5",
+                "serial": "0006ae6df11f",
+                "jumphost": true,
+                "ip": "10.28.3.100",
+                "username": "lanforge",
+                "password": "pumpkin77",
+                "port": 22,
+                "jumphost_tty": "/dev/ttyAP7",
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -208,7 +246,7 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP1",
-                "version": "release-latest"
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -246,7 +284,45 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP2",
-                "version": "release-latest"
+                "version": "next-latest"
+            }
+        ],
+        "traffic_generator": {
+            "name": "lanforge",
+            "details": {
+                "ip": "10.28.3.30",
+                "port": 8080,
+                "ssh_port": 22,
+                "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"],
+                "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"],
+                "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"],
+                "upstream": "1.1.eth2",
+                "upstream_subnet": "10.28.2.1/24",
+                "uplink": "1.1.eth3",
+                "2.4G-Station-Name": "wlan0",
+                "5G-Station-Name": "wlan0",
+                "AX-Station-Name": "ax"
+            }
+        }
+    },
+    "basic-06a": {
+        "controller": {
+            "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001",
+            "username": "tip@ucentral.com",
+            "password": "OpenWifi%123"
+        },
+        "access_point": [
+            {
+                "model": "hfcl_ion4xe",
+                "mode": "wifi6",
+                "serial": "0006ae6f7007",
+                "jumphost": true,
+                "ip": "10.28.3.103",
+                "username": "lanforge",
+                "password": "pumpkin77",
+                "port": 22,
+                "jumphost_tty": "/dev/ttyAP7",
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -284,7 +360,7 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP3",
-                "version": "release-latest"
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -315,14 +391,52 @@
             {
                 "model": "cig_wf194c",
                 "mode": "wifi6",
-                "serial": "089b4bb2f10c",
+                "serial": "00c115194c15",
                 "jumphost": true,
                 "ip": "10.28.3.103",
                 "username": "lanforge",
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP5",
-                "version": "release-latest"
+                "version": "next-latest"
+            }
+        ],
+        "traffic_generator": {
+            "name": "lanforge",
+            "details": {
+                "ip": "10.28.3.34",
+                "port": 8080,
+                "ssh_port": 22,
+                "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"],
+                "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"],
+                "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"],
+                "upstream": "1.1.eth2",
+                "upstream_subnet": "10.28.2.1/24",
+                "uplink": "1.1.eth3",
+                "2.4G-Station-Name": "wlan0",
+                "5G-Station-Name": "wlan0",
+                "AX-Station-Name": "ax"
+            }
+        }
+    },
+    "basic-08a": {
+        "controller": {
+            "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001",
+            "username": "tip@ucentral.com",
+            "password": "OpenWifi%123"
+        },
+        "access_point": [
+            {
+                "model": "udaya_a5-id2",
+                "mode": "wifi6",
+                "serial": "50987100327b",
+                "jumphost": true,
+                "ip": "10.28.3.103",
+                "username": "lanforge",
+                "password": "pumpkin77",
+                "port": 22,
+                "jumphost_tty": "/dev/ttyAP6",
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -421,6 +535,48 @@
             }
         }
 
+    },
+    "advanced-03": {
+        "controller": {
+            "url":"https://sec-qa01.cicd.lab.wlan.tip.build:16001",
+            "username": "tip@ucentral.com",
+            "password": "OpenWifi%123"
+        },
+        "access_point": [
+            {
+                "model": "cig_wf196",
+                "mode": "wifi6",
+                "serial": "824f816011e4",
+                "jumphost": true,
+                "ip": "10.28.3.115",
+                "username": "lanforge",
+                "password": "pumpkin77",
+                "port": 22 ,
+                "jumphost_tty": "/dev/ttyAP0",
+                "version": "release-latest"
+            }
+        ],
+        "traffic_generator": {
+            "name": "lanforge",
+            "details": {
+                "ip": "10.28.3.117",
+                "port": 8080,
+                "ssh_port": 22,
+                "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2","1.1.wiphy4"],
+                "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3", "1.1.wiphy5"],
+                "AX-Radio": ["1.2.wiphy0", "1.2.wiphy1", "1.2.wiphy2", "1.2.wiphy3", "1.2.wiphy4", "1.2.wiphy5", "1.2.wiphy6", "1.2.wiphy7", "1.2.wiphy8",
+                            "1.2.wiphy9", "1.2.wiphy10", "1.2.wiphy11", "1.3.wiphy0", "1.3.wiphy1", "1.3.wiphy2", "1.3.wiphy3", "1.3.wiphy4", "1.3.wiphy5",
+                            "1.3.wiphy6", "1.3.wiphy7", "1.3.wiphy8", "1.3.wiphy9", "1.3.wiphy10", "1.3.wiphy11", "1.3.wiphy12", "1.3.wiphy13", "1.3.wiphy14",
+                            "1.3.wiphy15", "1.3.wiphy16", "1.3.wiphy17", "1.3.wiphy18", "1.3.wiphy19", "1.3.wiphy20", "1.3.wiphy21", "1.3.wiphy22", "1.3.wiphy23"],
+                "upstream": "1.3.eth2",
+                "upstream_subnet": "10.28.2.1/24",
+                "uplink": "1.3.eth3",
+                "2.4G-Station-Name": "wlan0",
+                "5G-Station-Name": "wlan0",
+                "AX-Station-Name": "ax"
+            }
+        }
+
     },
     "mesh-01": {
         "controller": {
@@ -593,7 +749,6 @@
         }
     },
 
-
     "interop-01": {
         "controller": {
             "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001",
@@ -602,8 +757,8 @@
         },
         "access_point": [
             {
-                "model": "eap102",
+                "model": "edgecore_eap102",
-                "mode": "wifi5",
+                "mode": "wifi6",
                 "serial": "903cb39d69c0",
                 "jumphost": true,
                 "ip": "10.28.3.102",
@@ -611,7 +766,7 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP1",
-                "version": "release-latest"
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -652,7 +807,7 @@
                 "password": "pumpkin77",
                 "port": 22,
                 "jumphost_tty": "/dev/ttyAP4",
-                "version": "release-latest"
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -684,16 +839,57 @@
         },
         "access_point": [
             {
-                "model": "cig_wf194c",
+                "model": "edgecore_eap101",
                 "mode": "wifi6",
-                "serial": "f40b9fe78ce3",
+                "serial": "903cb36ae255",
                 "jumphost": true,
                 "ip": "10.28.3.102",
                 "username": "lanforge",
                 "password": "pumpkin77",
                 "port": 22,
-                "jumphost_tty": "/dev/ttyAP6",
+                "jumphost_tty": "/dev/ttyAP5",
-                "version": "release-latest"
+                "version": "next-latest"
+            }
+        ],
+        "traffic_generator": {
+            "name": "lanforge",
+            "details": {
+                "ip": "10.28.3.22",
+                "port": 8080,
+                "ssh_port": 22,
+                "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"],
+                "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"],
+                "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"],
+                "upstream": "1.1.eth1",
+                "upstream_subnet": "10.28.2.1/24",
+                "uplink": "1.1.eth3",
+                "2.4G-Station-Name": "wlan0",
+                "5G-Station-Name": "wlan1",
+                "AX-Station-Name": "ax",
+                "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJqdGkiOiJjYjRjYjQzYi05Y2FiLTQxNzQtOTYxYi04MDEwNTZkNDM2MzgiLCJleHAiOjAsIm5iZiI6MCwiaWF0IjoxNjExNTk0NzcxLCJpc3MiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwiYXVkIjoiaHR0cHM6Ly9hdXRoMi5wZXJmZWN0b21vYmlsZS5jb20vYXV0aC9yZWFsbXMvdGlwLXBlcmZlY3RvbW9iaWxlLWNvbSIsInN1YiI6IjdiNTMwYWUwLTg4MTgtNDdiOS04M2YzLTdmYTBmYjBkZGI0ZSIsInR5cCI6Ik9mZmxpbmUiLCJhenAiOiJvZmZsaW5lLXRva2VuLWdlbmVyYXRvciIsIm5vbmNlIjoiZTRmOTY4NjYtZTE3NS00YzM2LWEyODMtZTQwMmI3M2U5NzhlIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiYWNkNTQ3MTctNzJhZC00MGU3LWI0ZDctZjlkMTAyNDRkNWZlIiwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJyZXBvcnRpdW0iOnsicm9sZXMiOlsiYWRtaW5pc3RyYXRvciJdfSwiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.SOL-wlZiQ4BoLLfaeIW8QoxJ6xzrgxBjwSiSzkLBPYw",
+                "perfectoURL": "tip"
+            }
+        }
+    },
+
+    "interop-04": {
+        "controller": {
+            "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001",
+            "username": "tip@ucentral.com",
+            "password": "OpenWifi%123"
+        },
+        "access_point": [
+            {
+                "model": "cig_wf194c4",
+                "mode": "wifi6",
+                "serial": "f40b9fe78d3d",
+                "jumphost": true,
+                "ip": "10.28.3.102",
+                "username": "lanforge",
+                "password": "pumpkin77",
+                "port": 22,
+                "jumphost_tty": "/dev/ttyAP7",
+                "version": "next-latest"
             }
         ],
         "traffic_generator": {
@@ -854,7 +1050,6 @@
         "jobNumber": 38
     }
 },
-
 "RADIUS_SERVER_DATA" : {
     "ip": "10.10.1.221",
     "port": 1812,
@@ -987,3 +1182,4 @@
 
 
 }
+