Adding Pass/Fail for CIG WF_672 AP

tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py

@@ -106,25 +106,35 @@ def setup_initial_configuration(request):
     global setup_params_general
     global dut_data
     selected_tb = request.getfixturevalue("selected_testbed")
-    print(f"Selected Testbed: {selected_tb}")
+    logging.info(f"Selected Testbed: {selected_tb}")
     testbed_details_global = request.getfixturevalue("get_testbed_details")
     assert testbed_details_global is not None, "Testbed details should not be None"
-    print(f"Initialized Testbed Details: {testbed_details_global}")
+    logging.info(f"Initialized Testbed Details: {testbed_details_global}")
 
     # Extract 'mode' from the first device in 'device_under_tests'
     ap_mode = testbed_details_global["device_under_tests"][0].get("mode", "")
-
-    # Assign setup_params_general based on mode
+    supported_bands = testbed_details_global["device_under_tests"][0].get("supported_bands", [])
+    logging.info(f"supported_bands::{supported_bands}")
+    sixg_band = False
+    if "6G" in supported_bands:
+        sixg_band =True
+    logging.info(f"sixg_band:{sixg_band}")
+    logging.info(f'appliedRadios:{setup_params_general3["ssid_modes"]["wpa3_personal"][0]["appliedRadios"]}')
+    # Assign setup_params_general based on mode and supported_bands
     if ap_mode == "wifi6":
         setup_params_general = setup_params_general1
     elif ap_mode == "wifi6e":
         setup_params_general = setup_params_general2
-    elif ap_mode == "wifi7":
+    elif ap_mode == "wifi7" and sixg_band:
+        setup_params_general = setup_params_general3
+    elif ap_mode == "wifi7" and (not sixg_band):
+        # this is the case where the AP is WIFI7 AP but doesn't support 6g band.
+        setup_params_general3["ssid_modes"]["wpa3_personal"][0]["appliedRadios"] = ["2G", "5G"]
         setup_params_general = setup_params_general3
     else:
-        print(f"Unknown mode: {ap_mode}. Defaulting to None")
+        logging.info(f"Unknown mode: {ap_mode}. Defaulting to None")
 
-    print(f"Setup Params Assigned: {setup_params_general}")
+    logging.info(f"Setup Params Assigned: {setup_params_general}")
 
     get_marker = request.getfixturevalue("get_markers")
     requested_combination = []

tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py

@@ -114,18 +114,28 @@ def setup_initial_configuration(request):
 
     # Extract 'mode' from the first device in 'device_under_tests'
     ap_mode = testbed_details_global["device_under_tests"][0].get("mode", "")
-
-    # Assign setup_params_general based on mode
+    supported_bands = testbed_details_global["device_under_tests"][0].get("supported_bands", [])
+    logging.info(f"supported_bands::{supported_bands}")
+    sixg_band = False
+    if "6G" in supported_bands:
+        sixg_band = True
+    logging.info(f"sixg_band:{sixg_band}")
+    logging.info(f'appliedRadios:{setup_params_general3["ssid_modes"]["wpa3_personal"][0]["appliedRadios"]}')
+    # Assign setup_params_general based on mode and supported_bands
     if ap_mode == "wifi6":
         setup_params_general = setup_params_general1
     elif ap_mode == "wifi6e":
         setup_params_general = setup_params_general2
-    elif ap_mode == "wifi7":
+    elif ap_mode == "wifi7" and sixg_band:
+        setup_params_general = setup_params_general3
+    elif ap_mode == "wifi7" and (not sixg_band):
+        # this is the case where the AP is WIFI7 AP but doesn't support 6g band.
+        setup_params_general3["ssid_modes"]["wpa3_personal"][0]["appliedRadios"] = ["2G", "5G"]
         setup_params_general = setup_params_general3
     else:
-        print(f"Unknown mode: {ap_mode}. Defaulting to None")
+        logging.info(f"Unknown mode: {ap_mode}. Defaulting to None")
 
-    print(f"Setup Params Assigned: {setup_params_general}")
+    logging.info(f"Setup Params Assigned: {setup_params_general}")
 
     get_marker = request.getfixturevalue("get_markers")
     requested_combination = []

tests/e2e/basic/performance_tests/performance_pass_fail.json

@@ -721,6 +721,36 @@
         "UDP": 900
       }
       }
+    },
+    "cig_wf672":{
+      "AX":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 2x2 40MHz": {
+      "TCP": 400,
+      "UDP": 400
+     },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      }
+    },
+    "BE":{
+      "2G 2x2 20MHz": {
+        "TCP": 240,
+        "UDP": 240
+      },
+      "2G 2x2 40MHz": {
+      "TCP": 480,
+      "UDP": 480
+     },
+      "5G 2x2 80MHz": {
+        "TCP": 1000,
+        "UDP": 1000
+      }
+     }
     }
   }
 }

tests/e2e/basic/wifi_stats_comparison/wpa3_personal/test_stats_comparison.py

@@ -78,10 +78,15 @@ def test_stats_comparison(self, get_test_library, get_test_device_logs,
             "stats_comparison and bridge and wap3_personal"
         """
         ap_mode = get_testbed_details["device_under_tests"][0].get("mode", "")
-        if ap_mode == "wifi6e" or ap_mode == "wifi7":
-            bands = ["twog", "fiveg", "sixg"]
-        else:
-            bands = ["twog", "fiveg"]
+        supported_bands = get_testbed_details["device_under_tests"][0].get("supported_bands", [])
+        band_map = {
+            "2G": "twog",
+            "5G": "fiveg",
+            "6G": "sixg"
+        }
+        # convert supported bands to required format
+        bands = [band_map[b] for b in supported_bands if b in band_map]
+        logging.info(f"bands:{bands}")
 
         ssid_names = []
         for i in range(0,len(bands)):