From db831ba795f4377ae362318206122a7af362b81d Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Mon, 18 Dec 2023 20:27:38 +0530 Subject: [PATCH 1/9] Added 30 sec wait time after config push Signed-off-by: jitendracandela --- libs/tip_2x/tip_2x.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/tip_2x/tip_2x.py b/libs/tip_2x/tip_2x.py index 169d0c9e6f..af096017f5 100644 --- a/libs/tip_2x/tip_2x.py +++ b/libs/tip_2x/tip_2x.py @@ -346,7 +346,8 @@ def setup_basic_configuration(self, configuration=None, allure.attach(body=ap_logs, name="AP logs during config fails: ") logging.error("Failed to apply Config, Response code:" + str(resp.status_code)) pytest.fail("Failed to apply Config, Response code :" + str(resp.status_code)) - + logging.info("Waiting for 30 sec after config push") + time.sleep(30) r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=True, attach_allure=False) uuid_after_apply = r_data["latest"] x = 0 From 8d22050c47f5e38ee61ae18f1cc288de6563f9cf Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Tue, 19 Dec 2023 20:02:41 +0530 Subject: [PATCH 2/9] Modified logic for config push validation Signed-off-by: jitendracandela --- libs/tip_2x/tip_2x.py | 133 ++++++++++++++++++++++++++---------------- 1 file changed, 84 insertions(+), 49 deletions(-) diff --git a/libs/tip_2x/tip_2x.py b/libs/tip_2x/tip_2x.py index af096017f5..3cc81f847a 100644 --- a/libs/tip_2x/tip_2x.py +++ b/libs/tip_2x/tip_2x.py @@ -309,8 +309,8 @@ def setup_basic_configuration(self, configuration=None, idx=i) # Check the latest uuid - r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=True, attach_allure=False) - uuid_before_apply = r_data["latest"] + # r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=True, attach_allure=False) + # uuid_before_apply = r_data["latest"] # attaching ap logs before config push ap_logs = self.dut_library_object.get_dut_logs(idx=i, print_log=False, attach_allure=False) @@ -346,60 +346,95 @@ def setup_basic_configuration(self, configuration=None, allure.attach(body=ap_logs, name="AP logs during config fails: ") logging.error("Failed to apply Config, Response code:" + str(resp.status_code)) pytest.fail("Failed to apply Config, Response code :" + str(resp.status_code)) + # Find uuid from response + uuid = resp["details"]["uuid"] + logging.info("uuid from resp: " + str(uuid)) logging.info("Waiting for 30 sec after config push") time.sleep(30) r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=True, attach_allure=False) - uuid_after_apply = r_data["latest"] - x = 0 - while uuid_before_apply == uuid_after_apply: - time.sleep(10) - x += 1 - logging.info("uuid_before_apply: " + str(uuid_before_apply)) - logging.info("uuid_after_apply: " + str(uuid_after_apply)) - r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) - uuid_after_apply = r_data["latest"] - if x == 5: - break - time.sleep(5) - r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) - uuid_after_apply = r_data["latest"] - if uuid_after_apply == uuid_before_apply: - logging.error("Config is not received by AP") - logging.info("uuid_before_apply: " + str(uuid_before_apply)) - logging.info("uuid_after_apply: " + str(uuid_after_apply)) - self.dut_library_object.get_dut_logs(idx=i, print_log=False, attach_allure=True) - pytest.fail("Config sent from Gateway is not received by AP") - self.dut_library_object.get_latest_config_recieved(idx=i, print_log=True, attach_allure=False) - - r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) - latest_uuid = r_data["latest"] - - r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) - active_uuid = r_data["active"] - - x = 0 - while latest_uuid == active_uuid: - time.sleep(10) - x += 1 - logging.info("active_uuid: " + str(active_uuid)) - logging.info("latest_uuid: " + str(latest_uuid)) - r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) - active_uuid = r_data["active"] - latest_uuid = r_data["latest"] - if x == 5: - break - if latest_uuid != active_uuid: - logging.error("Config is not received by AP") - logging.info("uuid_before_apply: " + str(uuid_before_apply)) - logging.info("uuid_after_apply: " + str(uuid_after_apply)) - self.dut_library_object.get_dut_logs(idx=i, print_log=False, attach_allure=True) - pytest.fail("Config sent from Gateway is Received by AP, But not Applied by AP") - self.dut_library_object.get_active_config(idx=i, print_log=True, attach_allure=False) + latest_uuid_after_apply = r_data["latest"] + active_uuid_after_apply = r_data["active"] + logging.info("latest_uuid_after_apply: " + str(latest_uuid_after_apply)) + logging.info("active_uuid_after_apply: " + str(active_uuid_after_apply)) + print(type(uuid), type(latest_uuid_after_apply), type(active_uuid_after_apply)) + if uuid == latest_uuid_after_apply == active_uuid_after_apply: + logging.info("Config is Properly Applied on AP") + logging.info("latest_uuid_after_apply: " + str(latest_uuid_after_apply)) + logging.info("active_uuid_after_apply: " + str(active_uuid_after_apply)) + else: + all_three_uuid_same = False + for k in range(5): + time.sleep(10) + r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, + attach_allure=False) + latest_uuid_after_apply = r_data["latest"] + active_uuid_after_apply = r_data["active"] + logging.info("latest_uuid_after_apply: " + str(latest_uuid_after_apply)) + logging.info("active_uuid_after_apply: " + str(active_uuid_after_apply)) + if uuid == latest_uuid_after_apply == active_uuid_after_apply: + all_three_uuid_same = True + break + if not all_three_uuid_same: + logging.info("latest_uuid_after_apply: " + str(latest_uuid_after_apply)) + logging.info("active_uuid_after_apply: " + str(active_uuid_after_apply)) + self.dut_library_object.get_dut_logs(idx=i, print_log=False, attach_allure=True) + pytest.fail("Config is not Properly Applied on AP") - logging.info("Config is Properly Applied on AP, Waiting for 30 Seconds for All interfaces to come up") + self.dut_library_object.get_active_config(idx=i, print_log=True, attach_allure=False) + logging.info("Waiting for 30 Seconds for All interfaces to come up") # wait time interfaces to come up time.sleep(30) + # x = 0 + # while uuid_before_apply == uuid_after_apply: + # time.sleep(10) + # x += 1 + # logging.info("uuid_before_apply: " + str(uuid_before_apply)) + # logging.info("uuid_after_apply: " + str(uuid_after_apply)) + # r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) + # uuid_after_apply = r_data["latest"] + # if x == 5: + # break + # time.sleep(5) + # r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) + # uuid_after_apply = r_data["latest"] + # if uuid_after_apply == uuid_before_apply: + # logging.error("Config is not received by AP") + # logging.info("uuid_before_apply: " + str(uuid_before_apply)) + # logging.info("uuid_after_apply: " + str(uuid_after_apply)) + # self.dut_library_object.get_dut_logs(idx=i, print_log=False, attach_allure=True) + # pytest.fail("Config sent from Gateway is not received by AP") + # self.dut_library_object.get_latest_config_recieved(idx=i, print_log=True, attach_allure=False) + # + # r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) + # latest_uuid = r_data["latest"] + # + # r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) + # active_uuid = r_data["active"] + # + # x = 0 + # while latest_uuid == active_uuid: + # time.sleep(10) + # x += 1 + # logging.info("active_uuid: " + str(active_uuid)) + # logging.info("latest_uuid: " + str(latest_uuid)) + # r_data = self.dut_library_object.ubus_call_ucentral_status(idx=i, print_log=False, attach_allure=False) + # active_uuid = r_data["active"] + # latest_uuid = r_data["latest"] + # if x == 5: + # break + # if latest_uuid != active_uuid: + # logging.error("Config is not received by AP") + # logging.info("uuid_before_apply: " + str(uuid_before_apply)) + # logging.info("uuid_after_apply: " + str(uuid_after_apply)) + # self.dut_library_object.get_dut_logs(idx=i, print_log=False, attach_allure=True) + # pytest.fail("Config sent from Gateway is Received by AP, But not Applied by AP") + # self.dut_library_object.get_active_config(idx=i, print_log=True, attach_allure=False) + # + # logging.info("Config is Properly Applied on AP, Waiting for 30 Seconds for All interfaces to come up") + # # wait time interfaces to come up + # time.sleep(30) + self.post_apply_check(idx=i) # Do check AP after pushing the configuration for i in range(len(self.device_under_tests_info)): From 7dfced08b9959e18372cfee3b96523f8f5a1b33e Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Wed, 20 Dec 2023 10:10:45 +0530 Subject: [PATCH 3/9] Added json load for API response Signed-off-by: jitendracandela --- libs/tip_2x/tip_2x.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/tip_2x/tip_2x.py b/libs/tip_2x/tip_2x.py index 3cc81f847a..3a878090c0 100644 --- a/libs/tip_2x/tip_2x.py +++ b/libs/tip_2x/tip_2x.py @@ -347,6 +347,8 @@ def setup_basic_configuration(self, configuration=None, logging.error("Failed to apply Config, Response code:" + str(resp.status_code)) pytest.fail("Failed to apply Config, Response code :" + str(resp.status_code)) # Find uuid from response + resp = json.loads(resp.text) + logging.info("resp: " + str(resp)) uuid = resp["details"]["uuid"] logging.info("uuid from resp: " + str(uuid)) logging.info("Waiting for 30 sec after config push") From b9bec8b0cd5a648ccb3ea3616a9e486be2bc78a4 Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Tue, 26 Dec 2023 15:48:22 +0530 Subject: [PATCH 4/9] Changed auth-server ip Signed-off-by: jitendracandela --- .../wpa2_personal/test_radius_user_and_pass_bridge.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/basic/advanced_captive_portal_tests/wpa2_personal/test_radius_user_and_pass_bridge.py b/tests/e2e/basic/advanced_captive_portal_tests/wpa2_personal/test_radius_user_and_pass_bridge.py index 17f28c8f13..22b00960ec 100644 --- a/tests/e2e/basic/advanced_captive_portal_tests/wpa2_personal/test_radius_user_and_pass_bridge.py +++ b/tests/e2e/basic/advanced_captive_portal_tests/wpa2_personal/test_radius_user_and_pass_bridge.py @@ -18,7 +18,7 @@ {"ssid_name": "ssid_captive_portal_wpa2_2g_br", "appliedRadios": ["2G"], "security_key": "something", "captive": { "auth-mode": "radius", - "auth-server": "10.28.3.43", + "auth-server": "10.28.3.21", "auth-port": 1812, "auth-secret": "testing123", "walled-garden-fqdn": [ @@ -68,7 +68,7 @@ def test_bridge_wpa2_2g_radius_user_and_pass(self, get_test_library, get_dut_log "security_key": "something", "captive": { "auth-mode": "radius", - "auth-server": "10.28.3.43", + "auth-server": "10.28.3.21", "auth-port": 1812, "auth-secret": "testing123", "walled-garden-fqdn": [ From b94d16bf63765e17184fee0d6fc6ec5b6664abb4 Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Wed, 27 Dec 2023 12:28:16 +0530 Subject: [PATCH 5/9] Changed allow-dfs value to False Signed-off-by: jitendracandela --- libs/tip_2x/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/tip_2x/controller.py b/libs/tip_2x/controller.py index e95058b759..d344213f7b 100644 --- a/libs/tip_2x/controller.py +++ b/libs/tip_2x/controller.py @@ -2595,7 +2595,7 @@ def set_radio_config(self, radio_config={}, open_roaming=False): base_radio_config_5g = { "band": "5G", "country": "US", - "allow-dfs": True, + "allow-dfs": False, "channel-mode": "HE", "channel": "auto" } From 147a723a8db4bca17e39ec52b54e10071840623f Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Tue, 2 Jan 2024 23:19:47 +0530 Subject: [PATCH 6/9] Added 56Kbps upload rate for download test cases Signed-off-by: jitendracandela --- .../client_scale_test/wpa2_personal/test_nat_mode.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/basic/performance_tests/client_scale_test/wpa2_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/client_scale_test/wpa2_personal/test_nat_mode.py index a4a8ef99d6..b5241dd9fc 100644 --- a/tests/e2e/basic/performance_tests/client_scale_test/wpa2_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/client_scale_test/wpa2_personal/test_nat_mode.py @@ -55,7 +55,7 @@ def test_client_wpa2_NAT_tcp_dl(self, get_test_library, get_dut_logs_per_test_ca mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000", + upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"2G": max_stations}) assert True @@ -206,7 +206,7 @@ def test_client_wpa2_NAT_tcp_dl(self, get_test_library, get_dut_logs_per_test_ca mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000", + upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"5G": max_stations}) @@ -358,7 +358,7 @@ def test_client_wpa2_NAT_tcp_dl(self, get_test_library, get_dut_logs_per_test_ca mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000", + upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"2G": max_stations, "5G": max_stations}) assert True From 087d22a920d6a7b3a0d66fd0dad066884d5285cf Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Tue, 2 Jan 2024 23:30:26 +0530 Subject: [PATCH 7/9] Added 56Kbps download rate for upload test cases Signed-off-by: jitendracandela --- .../test_peak_throughput_wpa2_40Mhz_2g.py | 6 +++--- .../test_peak_throughput_wpa2_80Mhz_5g.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py index 559ed201b1..19715b2878 100644 --- a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py +++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py @@ -1378,7 +1378,7 @@ def test_client_wpa2_personal_nat_tcp_dl(self, get_test_library, get_dut_logs_pe mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_personal_nat_tcp_bidirectional", mode=mode, download_rate="1Gbps", batch_size="1", - upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000", + upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"2G": 1}) assert True @@ -1453,7 +1453,7 @@ def test_client_wpa2_personal_nat_tcp_ul(self, get_test_library, get_dut_logs_pe ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_personal_nat_tcp_ul", mode=mode, - download_rate="0Gbps", batch_size="1", + download_rate="56Kbps", batch_size="1", upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"2G": 1}) @@ -1472,7 +1472,7 @@ def test_client_wpa2_personal_nat_udp_ul(self, get_test_library, get_dut_logs_pe ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_personal_nat_udp_ul", mode=mode, - download_rate="0Gbps", batch_size="1", + download_rate="56Kbps", batch_size="1", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"2G": 1}) diff --git a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py index 154a9322e0..ab3bc07dec 100644 --- a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py +++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py @@ -58,7 +58,7 @@ def test_client_wpa2_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_ca mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_nat_tcp_bidirectional", mode=mode, download_rate="1Gbps", batch_size="1", - upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000", + upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"5G": 1}) assert True @@ -133,7 +133,7 @@ def test_client_wpa2_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_ca ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_nat_tcp_ul", mode=mode, - download_rate="0Gbps", batch_size="1", + download_rate="56Kbps", batch_size="1", upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"5G": 1}) @@ -152,7 +152,7 @@ def test_client_wpa2_nat_udp_ul(self, get_test_library, get_dut_logs_per_test_ca ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" get_test_library.wifi_capacity(instance_name="test_client_wpa2_nat_udp_ul", mode=mode, - download_rate="0Gbps", batch_size="1", + download_rate="56Kbps", batch_size="1", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"5G": 1}) From c9488e557e4c46fe8075bb247bb132ec827ffb29 Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Tue, 2 Jan 2024 23:46:31 +0530 Subject: [PATCH 8/9] Added twog band config in sixg test cases Signed-off-by: jitendracandela --- .../wpa3_personal/test_bridge_mode.py | 10 ++++++++-- .../wpa3_security/test_bridge_mode.py | 1 + .../wpa3_security/test_nat_mode.py | 1 + .../test_peak_throughput_wpa3_160Mhz_6g.py | 14 +++++++++++--- .../test_peak_throughput_wpa3_160Mhz_6g.py | 10 ++++++++-- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/tests/e2e/basic/performance_tests/client_scale_test/wpa3_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/client_scale_test/wpa3_personal/test_bridge_mode.py index ddb1710b3d..acd9c2cb8d 100644 --- a/tests/e2e/basic/performance_tests/client_scale_test/wpa3_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/client_scale_test/wpa3_personal/test_bridge_mode.py @@ -306,6 +306,7 @@ def test_client_wpa3_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test "mode": "BRIDGE", "ssid_modes": { "wpa3_personal": [ + {"ssid_name": "ssid_wpa3_2g", "appliedRadios": ["2G"], "security_key": "something"}, {"ssid_name": "ssid_wpa3_6g", "appliedRadios": ["6G"], "security_key": "something"} ] }, @@ -326,8 +327,7 @@ def test_client_wpa3_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test ) @pytest.mark.usefixtures("setup_configuration") @pytest.mark.wpa3_personal -@pytest.mark.sixg -@pytest.mark.sixg_band +@pytest.mark.twog @pytest.mark.performance class TestWifiCapacityBRIDGEMode6G(object): """ Client Scale Test BRIDGE mode @@ -336,6 +336,7 @@ class TestWifiCapacityBRIDGEMode6G(object): @pytest.mark.wpa3_personal @pytest.mark.tcp_download + @pytest.mark.sixg @allure.title("Test for TCP Download 6 GHz") def test_client_wpa3_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration, max_stations): @@ -355,6 +356,7 @@ def test_client_wpa3_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3659", name="WIFI-3659") @pytest.mark.wpa3_personal @pytest.mark.udp_download + @pytest.mark.sixg @allure.title("Test for UDP Download 6 GHz") def test_client_wpa3_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration, max_stations): @@ -374,6 +376,7 @@ def test_client_wpa3_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3669", name="WIFI-3669") @pytest.mark.wpa3_personal @pytest.mark.tcp_bidirectional + @pytest.mark.sixg @allure.title("Test for TCP Bidirectional 6 GHz") def test_client_wpa3_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration, @@ -394,6 +397,7 @@ def test_client_wpa3_bridge_tcp_bidirectional(self, get_test_library, get_dut_lo # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3663", name="WIFI-3663") @pytest.mark.wpa3_personal @pytest.mark.udp_bidirectional + @pytest.mark.sixg @allure.title("Test for UDP Bidirectional 6 GHz") def test_client_wpa3_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration, @@ -413,6 +417,7 @@ def test_client_wpa3_bridge_udp_bidirectional(self, get_test_library, get_dut_lo @pytest.mark.wpa3_personal @pytest.mark.tcp_upload + @pytest.mark.sixg @allure.title("Test for TCP Upload 6 GHz") def test_client_wpa3_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration, max_stations): @@ -431,6 +436,7 @@ def test_client_wpa3_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test @pytest.mark.wpa3_personal @pytest.mark.udp_upload + @pytest.mark.sixg @allure.title("Test for UDP Upload 6 GHz") def test_client_wpa3_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration, max_stations): diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py index 84cae7c1f4..05cc260ec4 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py @@ -95,6 +95,7 @@ def test_tcp_udp_wpa3_personal_bridge_5g_band(self, get_test_library, get_dut_lo ) @pytest.mark.wpa3_personal + @pytest.mark.twog @pytest.mark.sixg @pytest.mark.performance @allure.title("Test for TCP UDP Download 6 GHz") diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py index 1bfdd54c65..6545362bae 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py @@ -95,6 +95,7 @@ def test_tcp_udp_wpa3_personal_nat_5g_band(self, get_test_library, get_dut_logs_ ) @pytest.mark.wpa3_personal + @pytest.mark.twog @pytest.mark.sixg @pytest.mark.performance @allure.title("Test for TCP UDP Download 6 GHz") diff --git a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py index 26e23bd2ac..a2cfa03a49 100644 --- a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py +++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py @@ -14,7 +14,10 @@ setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "wpa3_personal": [{"ssid_name": "ssid_wpa3_6g_channel_auto", "appliedRadios": ["6G"], "security_key": "something"} + "wpa3_personal": [ + {"ssid_name": "ssid_wpa3_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_6g_channel_auto", "appliedRadios": ["6G"], "security_key": "something"} + ]}, "rf": { "6G": { @@ -37,13 +40,13 @@ scope="class" ) @pytest.mark.wpa3_personal -@pytest.mark.sixg -@pytest.mark.sixg_band +@pytest.mark.twog @pytest.mark.performance @pytest.mark.usefixtures("setup_configuration") class Test160Mhz6GChannelautoPeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12394", name="WIFI-12394") + @pytest.mark.sixg @pytest.mark.tcp_download @allure.title("Single client TCP Download wifi capacity 160Mhz Bw") def test_client_wpa3_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, @@ -63,6 +66,7 @@ def test_client_wpa3_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12395", name="WIFI-12395") @pytest.mark.udp_download + @pytest.mark.sixg @allure.title("Single client UDP Download wifi capacity 160Mhz Bw") def test_client_wpa3_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -81,6 +85,7 @@ def test_client_wpa3_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12397", name="WIFI-12397") @pytest.mark.tcp_bidirectional + @pytest.mark.sixg @allure.title("Single client TCP Bidirectional wifi capacity 160Mhz Bw") def test_client_wpa3_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -99,6 +104,7 @@ def test_client_wpa3_bridge_tcp_bidirectional(self, get_test_library, get_dut_lo @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12396", name="WIFI-12396") @pytest.mark.udp_bidirectional + @pytest.mark.sixg @allure.title("Single client UDP Bidirectional wifi capacity 160Mhz Bw") def test_client_wpa3_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -117,6 +123,7 @@ def test_client_wpa3_bridge_udp_bidirectional(self, get_test_library, get_dut_lo @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12393", name="WIFI-12393") @pytest.mark.tcp_upload + @pytest.mark.sixg @allure.title("Single client TCP Upload wifi capacity 160Mhz Bw") def test_client_wpa3_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -135,6 +142,7 @@ def test_client_wpa3_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12392", name="WIFI-12392") @pytest.mark.udp_upload + @pytest.mark.sixg @allure.title("Single client UDP Upload wifi capacity 160Mhz Bw") def test_client_wpa3_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): diff --git a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py index 6fd625de47..c6d8dcc379 100644 --- a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py +++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py @@ -15,6 +15,7 @@ "mode": "NAT", "ssid_modes": { "wpa3_personal": [ + {"ssid_name": "ssid_wpa3_2g", "appliedRadios": ["2G"], "security_key": "something"}, {"ssid_name": "ssid_wpa3_6g_channel_auto", "appliedRadios": ["6G"], "security_key": "something"} ]}, "rf": { @@ -37,14 +38,14 @@ scope="class" ) @pytest.mark.wpa3_personal -@pytest.mark.sixg -@pytest.mark.sixg_band +@pytest.mark.twog @pytest.mark.performance @pytest.mark.usefixtures("setup_configuration") class Test160Mhz6GChannelautoPeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12400", name="WIFI-12400") @pytest.mark.tcp_download + @pytest.mark.sixg @allure.title("Single client TCP Download wifi capacity 160Mhz Bw") def test_client_wpa3_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -63,6 +64,7 @@ def test_client_wpa3_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_ca @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12401", name="WIFI-12401") @pytest.mark.udp_download + @pytest.mark.sixg @allure.title("Single client UDP Download wifi capacity 160Mhz Bw") def test_client_wpa3_nat_udp_dl(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -81,6 +83,7 @@ def test_client_wpa3_nat_udp_dl(self, get_test_library, get_dut_logs_per_test_ca @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12403", name="WIFI-12403") @pytest.mark.tcp_bidirectional + @pytest.mark.sixg @allure.title("Single client TCP Bidirectional wifi capacity 160Mhz Bw") def test_client_wpa3_nat_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -99,6 +102,7 @@ def test_client_wpa3_nat_tcp_bidirectional(self, get_test_library, get_dut_logs_ @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12402", name="WIFI-12402") @pytest.mark.udp_bidirectional + @pytest.mark.sixg @allure.title("Single client UDP Bidirectional wifi capacity 160Mhz Bw") def test_client_wpa3_nat_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -117,6 +121,7 @@ def test_client_wpa3_nat_udp_bidirectional(self, get_test_library, get_dut_logs_ @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12399", name="WIFI-12399") @pytest.mark.tcp_upload + @pytest.mark.sixg @allure.title("Single client TCP Upload wifi capacity 160Mhz Bw") def test_client_wpa3_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): @@ -135,6 +140,7 @@ def test_client_wpa3_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_ca @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12398", name="WIFI-12398") @pytest.mark.udp_upload + @pytest.mark.sixg @allure.title("Single client UDP Upload wifi capacity 160Mhz Bw") def test_client_wpa3_nat_udp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): From 4fc19a50a32c150922e3586e5aac3c4d5a224e1e Mon Sep 17 00:00:00 2001 From: anil-tegala Date: Fri, 5 Jan 2024 13:34:46 +0530 Subject: [PATCH 9/9] testbed name fix for OAP101 performance tests Signed-off-by: anil-tegala --- .github/workflows/performance.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 88cd68f7f4..6654b54988 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -183,7 +183,7 @@ jobs: if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')" with: namespace: ${{ steps.namespace.outputs.name }}-ssdbt - testbed: basic-1a + testbed: basic-2a marker_expression: "performance and peak_throughput_tests" configuration_file: "./lab_info.json" testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} @@ -209,7 +209,7 @@ jobs: if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'client_scale_tests')" with: namespace: ${{ steps.namespace.outputs.name }}-wct - testbed: basic-1a + testbed: basic-2a marker_expression: "performance and client_scale_tests" configuration_file: "./lab_info.json" testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} @@ -235,7 +235,7 @@ jobs: if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')" with: namespace: ${{ steps.namespace.outputs.name }}-wct - testbed: basic-1a + testbed: basic-2a marker_expression: "performance and dual_band_tests" configuration_file: "./lab_info.json" testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}