Merge remote-tracking branch 'origin/master'

Author: Carsten Schafer

.allure-overview/overviews.json

@@ -10,7 +10,7 @@
 
     "advanced": {
         "OVERVIEW_TITLE": "'OpenWifi advanced results'",
-        "OVERVIEW_TESTBEDS": ["edgecore_eap104","edgecore_eap101","edgecore_eap111","hfcl_ion4xe","cig_wf189","edgecore_eap105","sonicfi_rap7110c-341x","cig_wf196","yuncore_fap655","udaya_a6-id2","sonicfi_rap630c-311g"]
+        "OVERVIEW_TESTBEDS": ["edgecore_eap104","edgecore_eap101","edgecore_eap111","edgecore_eap112","hfcl_ion4xe","cig_wf189","edgecore_eap105","sonicfi_rap7110c-341x","cig_wf189h","sonicfi_rap630c-311g","yuncore_fap655","edgecore_oap103","udaya_a6-id2","cig_wf196"]
     },
 
     "performance": {

.github/workflows/regression.yml

@@ -107,13 +107,31 @@ def check_connectivity(self, idx=0, print_log=True, attach_allure=True):
             pytest.fail("up0v0 interface is failed to have connectivity!!!")
 
     def get_uci_show(self, param="ucentral", idx=0, print_log=True, attach_allure=True):
-        output = self.run_generic_command(cmd="uci show " + param, idx=idx,
-                                          print_log=print_log,
-                                          attach_allure=attach_allure,
-                                          expected_attachment_type=allure.attachment_type.TEXT)
-
+        command = "uci show " + param
+        if "server" in param:
+            output = self.run_generic_command(cmd=command, idx=idx,
+                                              print_log=print_log,
+                                              attach_allure=attach_allure,
+                                              expected_attachment_type=allure.attachment_type.TEXT)
+            ret_val = str(output).split("=")[1]
+            if "cicd.lab.wlan.tip.build" in ret_val:
+                logging.info(f"we are fetching server url with the command: {command}")
+            else:
+                command = "cat /etc/ucentral/gateway.json"
+                logging.info(f"we are fetching server url with the command: {command}")
+                output = self.run_generic_command(cmd=command, idx=idx,
+                                                  print_log=print_log,
+                                                  attach_allure=attach_allure,
+                                                  expected_attachment_type=allure.attachment_type.TEXT)
+        else:
+            logging.info(f"command:{command}")
+            output = self.run_generic_command(cmd=command, idx=idx,
+                                              print_log=print_log,
+                                              attach_allure=attach_allure,
+                                              expected_attachment_type=allure.attachment_type.TEXT)
         return output
 
+
     def restart_ucentral_service(self, idx=0, print_log=True, attach_allure=True):
         output = self.run_generic_command(cmd="/etc/init.d/ucentral restart", idx=idx,
                                           print_log=print_log,

libs/tip_2x/ap_lib.py

@@ -69,8 +69,8 @@
         "UDP": null
       },
       "5G 2x2 80MHz": {
-        "TCP": 800,
-        "UDP": 900
+        "TCP": 600,
+        "UDP": 700
       },
       "5G 4x4 80MHz": {
         "TCP": null,
@@ -274,8 +274,8 @@
         "UDP": null
       },
       "5G 2x2 80MHz": {
-        "TCP": 800,
-        "UDP": 900
+        "TCP": 600,
+        "UDP": 700
       },
       "5G 4x4 80MHz": {
         "TCP": null,

tests/e2e/basic/performance_tests/performance_pass_fail.json

@@ -9,7 +9,7 @@
 from tabulate import tabulate
 from datetime import datetime
 
-pytestmark = [pytest.mark.schema_validation]
+pytestmark = [pytest.mark.schema_validation_tests, pytest.mark.ow_regression_lf]
 
 
 # Get the directory of the current test config file
@@ -22,12 +22,12 @@
     config_data_1 = json.loads(json_string)
 
 file_path2 = os.path.join(test_file_dir, 'master-config-2.json')
-with open(file_path, 'r') as file:
+with open(file_path2, 'r') as file:
     json_string = file.read()
     config_data_2 = json.loads(json_string)
 
 file_path3 = os.path.join(test_file_dir, 'master-config-3.json')
-with open(file_path, 'r') as file:
+with open(file_path3, 'r') as file:
     json_string = file.read()
     config_data_3 = json.loads(json_string)
 
@@ -50,7 +50,6 @@ def get_github_file(url, path=None, commit_id=None):
                     "wlan-ucentral-schema repo.")
     return response.text
 
-
 def validate_schema_through_github(commit_id, path):
     def get_commit_id(owner, repo, path="", headers=None):
         if headers is None:
@@ -116,14 +115,24 @@ def generate_diff(wlan_ucentral_schema_url, latest_version_id, previous_version_
         allure.attach(updated_schema_pretty_json, name=f"NEW {path}:")
 
         if updated_schema_pretty_json == previous_schema_pretty_json:
-            logging.info(f"No changes found at {path}. Exiting.")
+            logging.info(f"No changes were found at {path}. Exiting.")
+            allure.attach(name=f"No changes found at {path}", body=f"No changes were found at {path}. Exiting the test.")
             return None, None, None
         else:
             logging.info(f"Changes found at {path}. Proceeding with the comparison.")
             added_keys, removed_keys, changed_items = compare_dicts(json.loads(previous_schema_pretty_json),
                                                                     json.loads(updated_schema_pretty_json))
             return added_keys, removed_keys, changed_items
 
+    def convert_changed_items_to_vertical_table(changed_items):
+        formatted_rows = []
+        for path, old, new in changed_items:
+            formatted_rows.append(["Key Path", path])
+            formatted_rows.append(["Old Value", old])
+            formatted_rows.append(["New Value", new])
+            formatted_rows.append(["", ""])  # Add blank line between entries
+        return tabulate(formatted_rows, headers=["Field", "Content"], tablefmt="fancy_grid")
+
     if commit_id is None:
         logging.info("Use --commit-id to the pass an old commit-id of tip/wlan-ucentral-schema repo. Skipping the test.")
         pytest.skip("Use --commit-id to the pass an old commit-id of tip/wlan-ucentral-schema repo. Skipping the test.")
@@ -164,15 +173,17 @@ def generate_diff(wlan_ucentral_schema_url, latest_version_id, previous_version_
         if changed_items:
             changed_items = [list(key) for key in changed_items]
             changed_items = sorted(changed_items)
-            message = ("Note: The value at these key paths have been modified.\n\n"
-                       + tabulate(changed_items, headers=['Key Paths', 'Old Value', 'New Value'], tablefmt='fancy_grid'))
+            message = (
+                    "Note: The following key paths have modified values:\n\n"
+                    + convert_changed_items_to_vertical_table(changed_items)
+            )
             logging.info("\nChanged Items:\n" + message + "\n")
             allure.attach(message, name="Changed items:")
         pytest.fail(f"Differences found in the schema, check Test Body for Added/Removed/Changed items")
     return
 
 
-def validate_state_message_through_ap(test_object, target_object, config_data):
+def validate_state_message_through_ap(test_object, target_object, config_data, ssid=None):
     def get_type_of_message(message):
         type_of_message = "unknown"
         if isinstance(message, dict):
@@ -316,8 +327,9 @@ def verify_type_of_value(message, schema, path):
                 radio_5g = dict_all_radios_5g[radio][0]
                 break
 
+        logging.info(f"ssid:{ssid}")
         test_object.pre_cleanup()
-        fiveg_sta_got_ip = test_object.client_connect_using_radio(ssid="captive-credential-4",
+        fiveg_sta_got_ip = test_object.client_connect_using_radio(ssid=ssid,
                                                                        passkey="OpenWifi",
                                                                        security="wpa2", radio=radio_5g,
                                                                        station_name=["station-5G"],
@@ -448,7 +460,7 @@ def test_schema_through_github(self, commit_id):
         Objective is to identify any modifications, additions, or removals in the file: ucentral.schema.json.
 
         Unique Marker:
-        schema_validation and through_github and schema_json
+        schema_validation_tests and through_github and schema_json
         """
         validate_schema_through_github(commit_id, "/ucentral.schema.json")
 
@@ -466,7 +478,7 @@ def test_schema_full_through_github(self, commit_id):
         Objective is to identify any modifications, additions, or removals in the file: ucentral.schema.full.json.
 
         Unique Marker:
-        schema_validation and through_github and schema_full_json
+        schema_validation_tests and through_github and schema_full_json
         """
         validate_schema_through_github(commit_id, "/ucentral.schema.full.json")
 
@@ -483,7 +495,7 @@ def test_schema_pretty_through_github(self, commit_id):
         Objective is to identify any modifications, additions, or removals in the file: ucentral.schema.pretty.json.
 
         Unique Marker:
-        schema_validation and through_github and schema_pretty_json
+        schema_validation_tests and through_github and schema_pretty_json
         """
         validate_schema_through_github(commit_id, "/ucentral.schema.pretty.json")
 
@@ -500,7 +512,7 @@ def test_state_pretty_through_github(self, commit_id):
         Objective is to identify any modifications, additions, or removals in the file: ucentral.state.pretty.json.
 
         Unique Marker:
-        schema_validation and through_github and state_pretty_json
+        schema_validation_tests and through_github and state_pretty_json
         """
         validate_schema_through_github(commit_id, "/ucentral.state.pretty.json")
 
@@ -524,9 +536,10 @@ def test_state_message_schema_master_config_1(self, get_test_library, get_target
         Objective is to detect discrepancies in data types (e.g., string to integer) and object structures.
 
         Unique Marker:
-        schema_validation and through_ap_terminal and master_config_1
+        schema_validation_tests and through_ap_terminal and master_config_1
         """
-        validate_state_message_through_ap(get_test_library, get_target_object, config_data=config_data_1)
+        ssid = "captive-credential-4"
+        validate_state_message_through_ap(get_test_library, get_target_object, config_data=config_data_1, ssid=ssid)
 
     @pytest.mark.master_config_2
     @allure.title("Pushing master config-2")
@@ -541,9 +554,10 @@ def test_state_message_schema_master_config_2(self, get_test_library, get_target
         Objective is to detect discrepancies in data types (e.g., string to integer) and object structures.
 
         Unique Marker:
-        schema_validation and through_ap_terminal and master_config_2
+        schema_validation_tests and through_ap_terminal and master_config_2
         """
-        validate_state_message_through_ap(get_test_library, get_target_object, config_data=config_data_2)
+        ssid = "captive-uam-8"
+        validate_state_message_through_ap(get_test_library, get_target_object, config_data=config_data_2, ssid=ssid)
 
     @pytest.mark.master_config_3
     @allure.title("Pushing master config-3")
@@ -558,6 +572,7 @@ def test_state_message_schema_master_config_3(self, get_test_library, get_target
         Objective is to detect discrepancies in data types (e.g., string to integer) and object structures.
 
         Unique Marker:
-        schema_validation and through_ap_terminal and master_config_3
+        schema_validation_tests and through_ap_terminal and master_config_3
         """
-        validate_state_message_through_ap(get_test_library, get_target_object, config_data=config_data_3)
+        ssid = "Uchannel-ds-4"
+        validate_state_message_through_ap(get_test_library, get_target_object, config_data=config_data_3, ssid=ssid)

tests/e2e/basic/schema_validation/test_schema_validation.py

@@ -130,124 +130,3 @@ def test_client_wpa2_2g_vlan2(self, get_test_library, get_dut_logs_per_test_case
                                         passkey=security_key,
                                         encryption=security, mode=mode, num_sta=1, dut_data=setup_configuration)
         assert True
-
-
-
-setup_params_general = {
-    "mode": "BRIDGE",
-    "ssid_modes": {
-        "wpa2_personal": [
-            {"ssid_name": "OpenWifi-roam",
-             "appliedRadios": ["2G", "5G"],
-             "security": "psk2",
-             "security_key": "OpenWifi",
-             "multi-psk": [
-                 {"key": "aaaaaaaa"},
-                 {"key": "bbbbbbbb"}
-             ],
-            "roaming": True,
-            "rrm": {
-            "reduced-neighbor-reporting": True
-                    }
-             }
-        ],
-        "wpa3_personal": [
-            {"ssid_name": "OpenWifi-roam",
-             "appliedRadios": ["6G"],
-             "security": "sae",
-             "security_key": "OpenWifi",
-            "roaming": True,
-            "rrm": {
-            "reduced-neighbor-reporting": True
-                    }
-             }
-        ]
-    },
-    "rf": {
-        "2G": {
-            "band": "2G",
-            "channel-width": 20,
-            "channel-mode": "EHT",
-            "channel": "auto"
-        },
-        "5G": {
-            "band": "5G",
-            "channel-width": 80,
-            "channel-mode": "EHT",
-            "channel": 36
-        },
-        "6G": {
-            "band": "6G",
-            "channel-width": 320,
-            "channel-mode": "EHT",
-            "channel": 33
-        }
-    },
-    "radius": False
-}
-
-testbed_details_global = None
-dut_data = {}
-
-@pytest.fixture(scope="class")
-def setup_initial_configuration(request):
-    """Calls setup_testbed automatically before tests"""
-    global setup_params_general
-    global dut_data
-    logging.info(f"Setup Params Assigned: {setup_params_general}")
-
-    requested_combination = [['2G', 'wpa2_personal'], ['5G', 'wpa2_personal'], ['6G', 'wpa3_personal']]
-
-    logging.info(f"requested_combination:::{requested_combination}")
-    get_target_obj = request.getfixturevalue("get_target_object")
-    logging.info("ready to start setup_basic_configuration")
-    logging.info(f"setup_params_general value before start:{setup_params_general}")
-    dut_data = get_target_obj.setup_basic_configuration(configuration=setup_params_general,
-                                                       requested_combination=requested_combination)
-
-    logging.info(f"setup_basic_configuration dut data:{dut_data}")
-
-@allure.feature("MultiPsk Test")
-@allure.parent_suite("MultiPsk Test")
-@allure.suite("BRIDGE Mode")
-@allure.sub_suite("WPA2 Security")
-class TestEmpsk6GBridgeWPA2(object):
-
-    # @pytest.mark.wpa3_personal
-    # @pytest.mark.wpa2_personal
-    # @pytest.mark.sixg
-    # @pytest.mark.twog
-    # @pytest.mark.fiveg
-    @pytest.mark.empsk
-    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-14423", name="WIFI-14423")
-    @allure.title("Test E-MPSK with WPA2 to WPA3 on 6GHz")
-    def test_client_wpa2_wpa3_6g_empsk(self, setup_initial_configuration, get_test_library,get_target_object,
-                                     check_connectivity, get_testbed_details):
-        """
-        Verify E-MPSK working in BRIDGE mode:
-        - Client connects on 2.4/5GHz (WPA2 and WPA3)
-        - Encryption is changed from WPA2 to WPA3 (disable WPA2)
-        - Verify client successfully get an IP and associate to AP
-        """
-        profile_data = {
-            "ssid_name": "OpenWifi-roam",
-            "appliedRadios": ["2G"],
-            "security": "psk2",
-            "security_key": "OpenWifi",
-            "multi-psk": [
-                {"key": "aaaaaaaa"},
-                {"key": "bbbbbbbb"}
-            ]
-        }
-        ssid = profile_data["ssid_name"]
-        security = "wpa2"
-        mode = "BRIDGE"
-        band = "twog"
-        num_sta = 1
-        security_key = profile_data["multi-psk"][0]["key"]
-        sta_data = get_test_library.empsk_test(ssid=ssid, passkey=security_key, security=security, is_bw320=True,
-                                                   mode=mode, band=band, pre_cleanup=True, num_sta=num_sta,
-                                                   scan_ssid=True, dut_data=dut_data, extra_securities = ["wpa3"],
-                                                   allure_attach=True)
-
-        logging.info(f"sta_data{sta_data}")