Add support for wifi6 vs wifi5 rf profiles

py-scripts/tip-cicd-sanity/Nightly_Sanity.py

@@ -754,6 +754,18 @@ for key in equipment_ids:
                 report_data['tests'][key][test_cases["radius_profile"]] = "failed"
         else:
             print("Skipped creating RADIUS profile based on skip_eap argument")
+
+        # Set RF Profile Id depending on AP capability
+        if lab_ap_info.ap_spec[key] == "wifi5":
+            rfProfileId = lab_ap_info.rf_profile_wifi5
+            print("using Wi-Fi5 profile Id")
+        elif lab_ap_info.ap_spec[key] == "wifi6":
+            rfProfileId = lab_ap_info.rf_profile_wifi6
+            print("using Wi-Fi6 profile Id")
+        else:
+            rfProfileId = 10
+            print("Unknown AP radio spec, using default RF profile")
+
         ###########################################################################
         ############## Bridge Mode Client Connectivity ############################
         ###########################################################################
@@ -895,7 +907,7 @@ for key in equipment_ids:
                 twoFourG_wpa = profile_info_dict[fw_model]["twoFourG_WPA_profile"]
 
             ### Create AP Bridge Profile
-            rfProfileId = lab_ap_info.rf_profile
+            #rfProfileId = lab_ap_info.rf_profile
             if args.skip_eap != True:
                 child_profiles = [fiveG_eap, fiveG_wpa2, fiveG_wpa, twoFourG_eap, twoFourG_wpa2, twoFourG_wpa,
                                   rfProfileId]
@@ -1296,7 +1308,7 @@ for key in equipment_ids:
                 twoFourG_wpa = profile_info_dict[fw_model + '_nat']["twoFourG_WPA_profile"]
 
             ### Create AP NAT Profile
-            rfProfileId = lab_ap_info.rf_profile
+            #rfProfileId = lab_ap_info.rf_profile
             if args.skip_eap != True:
                 radiusProfileId = radius_profile
                 child_profiles = [fiveG_eap, fiveG_wpa2, fiveG_wpa, twoFourG_eap, twoFourG_wpa2, twoFourG_wpa,
@@ -1695,7 +1707,7 @@ for key in equipment_ids:
                 twoFourG_wpa = profile_info_dict[fw_model + '_vlan']["twoFourG_WPA_profile"]
 
             ### Create AP VLAN Profile
-            rfProfileId = lab_ap_info.rf_profile
+            #rfProfileId = lab_ap_info.rf_profile
             if args.skip_eap != True:
                 child_profiles = [fiveG_eap, fiveG_wpa2, fiveG_wpa, twoFourG_eap, twoFourG_wpa2, twoFourG_wpa,
                                   rfProfileId]

py-scripts/tip-cicd-sanity/lab_ap_info.py

@@ -8,13 +8,13 @@ cloud_type = "v1"
 
 ##LANForge Info
 lanforge_ip = "10.10.10.201"
-lanforge_2dot4g = "wiphy0"
+lanforge_2dot4g = "wiphy6"
-lanforge_5g = "wiphy3"
+lanforge_5g = "wiphy6"
 # For single client connectivity use cases, use full station name for prefix to only read traffic from client under test
-lanforge_2dot4g_prefix = "test"
+lanforge_2dot4g_prefix = "wlan6"
-lanforge_5g_prefix = "test"
+lanforge_5g_prefix = "wlan6"
-lanforge_2dot4g_station = "test1234"
+lanforge_2dot4g_station = "wlan6"
-lanforge_5g_station = "test1234"
+lanforge_5g_station = "wlan6"
 
 ##RADIUS Info
 radius_info = {
@@ -43,6 +43,19 @@ cloud_sdk_models = {
     "eap102": "EAP102"
 }
 
+ap_spec = {
+    "ec420": "wifi5",
+    "ea8300": "wifi5",
+    "ecw5211": "wifi5",
+    "ecw5410": "wifi5",
+    "wf188n": "wifi6",
+    "wf194c": "wifi6",
+    "ex227": "wifi6",
+    "ex447": "wifi6",
+    "eap101": "wifi6",
+    "eap102": "wifi6"
+}
+
 mimo_5g = {
     "ec420": "4x4",
     "ea8300": "2x2",
@@ -87,10 +100,10 @@ customer_id = "2"
 
 ##Equipment IDs for Lab APs under test
 equipment_id_dict = {
-    "ea8300": "3",
+    #"ea8300": "3",
-    "ecw5410": "5",
+    #"ecw5410": "5",
-    "ecw5211": "2",
+    "ecw5211": "22",
-    "ec420": "11",
+    #"ec420": "11",
     "wf188n": "14",
     "ex227": "18",
     "eap102": "7",
@@ -101,18 +114,18 @@ equipment_ip_dict = {
     "ea8300": "10.10.10.103",
     "ecw5410": "10.10.10.105",
     "ec420": "10.10.10.104",
-    "ecw5211": "10.10.10.102",
+    "ecw5211": "10.10.10.187",
     "wf188n": "10.10.10.179",
     "wf194c": "10.10.10.184",
     "ex227": "10.10.10.185",
-    "eap102": "10.10.10.183"
+    "eap102": "10.10.10.186"
 }
 
 eqiupment_credentials_dict = {
     "ea8300": "openwifi",
     "ecw5410": "openwifi",
     "ec420": "openwifi",
-    "ecw5211": "admin123",
+    "ecw5211": "openwifi",
     "wf188n": "openwifi",
     "wf194c": "openwifi",
     "ex227": "openwifi",
@@ -181,8 +194,9 @@ test_cases = {
 }
 
 ## Other profiles
-radius_profile = 1234
+radius_profile = 9
-rf_profile = 10
+rf_profile_wifi5 = 10
+rf_profile_wifi6 = 762
 
 ###Testing AP Profile Information
 profile_info_dict = {