From f3c1db0b2fef35bc0bb65a5e20dbc52400d4bf08 Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Tue, 20 Sep 2022 18:13:50 +0530 Subject: [PATCH] Added ow_sanity_lf marker Signed-off-by: jitendracandela --- .../test_peak_throughput_wpa2_40Mhz_2g.py | 336 ------------------ .../test_peak_throughput_wpa2_80Mhz_5g.py | 36 -- 2 files changed, 372 deletions(-) diff --git a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py index e7a3ad25a..9debff38a 100644 --- a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py +++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py @@ -14,12 +14,8 @@ pytestmark = [pytest.mark.peak_throughput_tests, pytest.mark.bridge, pytest.mark setup_params_general_1 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_1", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_1", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -45,31 +41,18 @@ class Test20Mhz2GChannel1PeakThroughput(object): pytest -m "country_code and Bridge" """ -<<<<<<< HEAD @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-10674", name="WIFI-10674") @pytest.mark.tcp_download def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ To verify Wfi Capacity test on a client operating on BRIDGE mode and 20MHz pytest -m "channel_1 and BRIDGE and wpa2_personal and twog" -======= - @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") - @pytest.mark.tcp_download - def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): - """ Wifi Capacity Test BRIDGE mode - pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" ->>>>>>> Addded peak_throughput_tests in nat mode """ profile_data = {"ssid_name": "ssid_wpa2_personal_2g_1", "appliedRadios": ["2G"], "security_key": "something"} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" get_test_library.wifi_capacity(instance_name="test_client_wpa2_personal_bridge_tcp_bidirectional", mode=mode, -<<<<<<< HEAD download_rate="1.5Gbps", batch_size="1", -======= - download_rate="1Gbps", batch_size="1", ->>>>>>> Addded peak_throughput_tests in nat mode upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"2G": 1}) @@ -78,11 +61,7 @@ class Test20Mhz2GChannel1PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -99,11 +78,7 @@ class Test20Mhz2GChannel1PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -120,11 +95,7 @@ class Test20Mhz2GChannel1PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -141,11 +112,7 @@ class Test20Mhz2GChannel1PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -162,11 +129,7 @@ class Test20Mhz2GChannel1PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -184,12 +147,8 @@ class Test20Mhz2GChannel1PeakThroughput(object): setup_params_general_2 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_2", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_2", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -218,11 +177,7 @@ class Test20Mhz2GChannel2PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") @pytest.mark.tcp_download def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -239,11 +194,7 @@ class Test20Mhz2GChannel2PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -260,11 +211,7 @@ class Test20Mhz2GChannel2PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -281,11 +228,7 @@ class Test20Mhz2GChannel2PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -302,11 +245,7 @@ class Test20Mhz2GChannel2PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -323,11 +262,7 @@ class Test20Mhz2GChannel2PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -345,12 +280,8 @@ class Test20Mhz2GChannel2PeakThroughput(object): setup_params_general_3 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_3", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_3", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -379,11 +310,7 @@ class Test20Mhz2GChannel3PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") @pytest.mark.tcp_download def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -400,11 +327,7 @@ class Test20Mhz2GChannel3PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -421,11 +344,7 @@ class Test20Mhz2GChannel3PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -442,11 +361,7 @@ class Test20Mhz2GChannel3PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -463,11 +378,7 @@ class Test20Mhz2GChannel3PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -484,11 +395,7 @@ class Test20Mhz2GChannel3PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -506,12 +413,8 @@ class Test20Mhz2GChannel3PeakThroughput(object): setup_params_general_4 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_4", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_4", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -540,11 +443,7 @@ class Test20Mhz2GChannel4PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") @pytest.mark.tcp_download def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -561,11 +460,7 @@ class Test20Mhz2GChannel4PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -582,11 +477,7 @@ class Test20Mhz2GChannel4PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -603,11 +494,7 @@ class Test20Mhz2GChannel4PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -624,11 +511,7 @@ class Test20Mhz2GChannel4PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -645,11 +528,7 @@ class Test20Mhz2GChannel4PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -667,12 +546,8 @@ class Test20Mhz2GChannel4PeakThroughput(object): setup_params_general_5 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_5", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_5", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -701,11 +576,7 @@ class Test20Mhz2GChannel5PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") @pytest.mark.tcp_download def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -722,11 +593,7 @@ class Test20Mhz2GChannel5PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -743,11 +610,7 @@ class Test20Mhz2GChannel5PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -764,11 +627,7 @@ class Test20Mhz2GChannel5PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -785,11 +644,7 @@ class Test20Mhz2GChannel5PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -806,11 +661,7 @@ class Test20Mhz2GChannel5PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -828,12 +679,8 @@ class Test20Mhz2GChannel5PeakThroughput(object): setup_params_general_6 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_6", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_6", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -862,11 +709,7 @@ class Test20Mhz2GChannel6PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") @pytest.mark.tcp_download def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -883,11 +726,7 @@ class Test20Mhz2GChannel6PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -904,11 +743,7 @@ class Test20Mhz2GChannel6PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -925,11 +760,7 @@ class Test20Mhz2GChannel6PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -946,11 +777,7 @@ class Test20Mhz2GChannel6PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -967,11 +794,7 @@ class Test20Mhz2GChannel6PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -989,12 +812,8 @@ class Test20Mhz2GChannel6PeakThroughput(object): setup_params_general_7 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_7", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_7", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -1024,11 +843,7 @@ class Test20Mhz2GChannel7PeakThroughput(object): @pytest.mark.tcp_download @pytest.mark.aaa def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1045,11 +860,7 @@ class Test20Mhz2GChannel7PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1066,11 +877,7 @@ class Test20Mhz2GChannel7PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1087,11 +894,7 @@ class Test20Mhz2GChannel7PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1108,11 +911,7 @@ class Test20Mhz2GChannel7PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1129,11 +928,7 @@ class Test20Mhz2GChannel7PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1151,12 +946,8 @@ class Test20Mhz2GChannel7PeakThroughput(object): setup_params_general_8 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_8", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_8", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -1185,11 +976,7 @@ class Test20Mhz2GChannel8PeakThroughput(object): @pytest.mark.tcp_download @pytest.mark.aaa def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1206,11 +993,7 @@ class Test20Mhz2GChannel8PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1227,11 +1010,7 @@ class Test20Mhz2GChannel8PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1248,11 +1027,7 @@ class Test20Mhz2GChannel8PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1269,11 +1044,7 @@ class Test20Mhz2GChannel8PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1290,11 +1061,7 @@ class Test20Mhz2GChannel8PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1312,12 +1079,8 @@ class Test20Mhz2GChannel8PeakThroughput(object): setup_params_general_9 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_9", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_9", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -1347,11 +1110,7 @@ class Test20Mhz2GChannel9PeakThroughput(object): @pytest.mark.tcp_download @pytest.mark.aaa def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1368,11 +1127,7 @@ class Test20Mhz2GChannel9PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1389,11 +1144,7 @@ class Test20Mhz2GChannel9PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1410,11 +1161,7 @@ class Test20Mhz2GChannel9PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1431,11 +1178,7 @@ class Test20Mhz2GChannel9PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1452,11 +1195,7 @@ class Test20Mhz2GChannel9PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1474,12 +1213,8 @@ class Test20Mhz2GChannel9PeakThroughput(object): setup_params_general_10 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_10", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_10", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -1508,11 +1243,7 @@ class Test20Mhz2GChannel10PeakThroughput(object): @pytest.mark.tcp_download @pytest.mark.aaa def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1529,11 +1260,7 @@ class Test20Mhz2GChannel10PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1550,11 +1277,7 @@ class Test20Mhz2GChannel10PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1571,11 +1294,7 @@ class Test20Mhz2GChannel10PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1592,11 +1311,7 @@ class Test20Mhz2GChannel10PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1613,11 +1328,7 @@ class Test20Mhz2GChannel10PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, -<<<<<<< HEAD get_test_device_logs, num_stations, setup_configuration): -======= - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1635,12 +1346,8 @@ class Test20Mhz2GChannel10PeakThroughput(object): setup_params_general_11 = { "mode": "BRIDGE", "ssid_modes": { -<<<<<<< HEAD "wpa2_personal": [ {"ssid_name": "ssid_wpa2_personal_2g_11", "appliedRadios": ["2G"], "security_key": "something"}]}, -======= - "wpa2_personal": [{"ssid_name": "ssid_wpa2_personal_2g_11", "appliedRadios": ["2G"], "security_key": "something"}]}, ->>>>>>> Addded peak_throughput_tests in nat mode "rf": { "2G": { 'band': '2G', @@ -1652,12 +1359,9 @@ setup_params_general_11 = { @allure.feature("PEAK THROUGHPUT TESTS") -<<<<<<< HEAD @allure.parent_suite("Throughput Benchmark Test") @allure.suite("2.4 Ghz Band") @allure.sub_suite("BRIDGE Mode") -======= ->>>>>>> Addded peak_throughput_tests in nat mode @pytest.mark.channel_11 @pytest.mark.parametrize( 'setup_configuration', @@ -1666,7 +1370,6 @@ setup_params_general_11 = { scope="class" ) @pytest.mark.usefixtures("setup_configuration") -<<<<<<< HEAD class Test40Mhz2GChannel11PeakThroughput(object): """Country code along with Channel and Channel-width Test Bridge mode pytest -m "ow_sanity_lf and tcp_download and channel_11" @@ -1683,20 +1386,6 @@ class Test40Mhz2GChannel11PeakThroughput(object): check_connectivity): """ Single client TCP download Wifi Capacity Test 2.4GHz band 40MHz bandwidth wpa2 personal security BRIDGE mode pytest -m "ow_sanity_lf and channel_11" -======= -class Test20Mhz2GChannel11PeakThroughput(object): - """Country code along with Channel and Channel-width Test Bridge mode - pytest -m "country_code and Bridge" - """ - - @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") - @pytest.mark.tcp_download - @pytest.mark.aaa - def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): - """ Wifi Capacity Test BRIDGE mode - pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" ->>>>>>> Addded peak_throughput_tests in nat mode """ profile_data = {"ssid_name": "ssid_wpa2_personal_2g_11", "appliedRadios": ["2G"], "security_key": "something"} ssid_name = profile_data["ssid_name"] @@ -1710,15 +1399,10 @@ class Test20Mhz2GChannel11PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client UDP Download wifi capacity 40Mhz Bw") def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): -======= - def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1734,15 +1418,10 @@ class Test20Mhz2GChannel11PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") @pytest.mark.tcp_bidirectional -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client TCP Bidirectional wifi capacity 40Mhz Bw") def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): -======= - def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1758,15 +1437,10 @@ class Test20Mhz2GChannel11PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client UDP Bidirectional wifi capacity 40Mhz Bw") def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): -======= - def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1782,15 +1456,10 @@ class Test20Mhz2GChannel11PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client TCP Upload wifi capacity 40Mhz Bw") def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): -======= - def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ @@ -1806,15 +1475,10 @@ class Test20Mhz2GChannel11PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client UDP Upload wifi capacity 40Mhz Bw") def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): -======= - def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): ->>>>>>> Addded peak_throughput_tests in nat mode """ Wifi Capacity Test BRIDGE mode pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ diff --git a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py index 4758494ac..3f9d6418c 100644 --- a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py +++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py @@ -28,12 +28,9 @@ setup_params_general1 = { @allure.feature("PEAK THROUGHPUT TESTS") -<<<<<<< HEAD @allure.parent_suite("Throughput Benchmark Test") @allure.suite("5 Ghz Band") @allure.sub_suite("BRIDGE Mode") -======= ->>>>>>> Addded peak_throughput_tests in nat mode @pytest.mark.channel_36 @pytest.mark.parametrize( 'setup_configuration', @@ -49,7 +46,6 @@ class Test80Mhz5GChannel36PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") @pytest.mark.tcp_download -<<<<<<< HEAD @pytest.mark.ow_sanity_lf @pytest.mark.performance @allure.title("Single client TCP Download wifi capacity 80Mhz Bw") @@ -57,23 +53,12 @@ class Test80Mhz5GChannel36PeakThroughput(object): get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Single client TCP download Wifi Capacity Test 5GHz band 80MHz bandwidth wpa2 personal security BRIDGE mode pytest -m "ow_sanity_lf and channel_36" -======= - @pytest.mark.aaa - def test_client_wpa2_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): - """ Wifi Capacity Test BRIDGE mode - pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" ->>>>>>> Addded peak_throughput_tests in nat mode """ profile_data = {"ssid_name": "ssid_wpa2_5g_36", "appliedRadios": ["5G"], "security_key": "something"} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" get_test_library.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_bidirectional", mode=mode, -<<<<<<< HEAD download_rate="1.5Gbps", batch_size="1", -======= - download_rate="1Gbps", batch_size="1", ->>>>>>> Addded peak_throughput_tests in nat mode upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, num_stations={"5G": 1}) @@ -81,11 +66,8 @@ class Test80Mhz5GChannel36PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944") @pytest.mark.udp_download -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client UDP Download wifi capacity 80Mhz Bw") -======= ->>>>>>> Addded peak_throughput_tests in nat mode def test_client_wpa2_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ Wifi Capacity Test BRIDGE mode @@ -101,7 +83,6 @@ class Test80Mhz5GChannel36PeakThroughput(object): num_stations={"5G": 1}) assert True -<<<<<<< HEAD @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-10673", name="WIFI-10673") @pytest.mark.tcp_bidirectional @pytest.mark.performance @@ -110,14 +91,6 @@ class Test80Mhz5GChannel36PeakThroughput(object): def test_client_wpa2_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ Wifi Capacity Test BRIDGE mode -======= - @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943") - @pytest.mark.tcp_bidirectional - def test_client_wpa2_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): - """ Wifi Capacity Test BRIDGE mode - pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" ->>>>>>> Addded peak_throughput_tests in nat mode """ profile_data = {"ssid_name": "ssid_wpa2_5g_36", "appliedRadios": ["5G"], "security_key": "something"} ssid_name = profile_data["ssid_name"] @@ -131,11 +104,8 @@ class Test80Mhz5GChannel36PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946") @pytest.mark.udp_bidirectional -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client UDP Bidirectional wifi capacity 80Mhz Bw") -======= ->>>>>>> Addded peak_throughput_tests in nat mode def test_client_wpa2_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ Wifi Capacity Test BRIDGE mode @@ -153,11 +123,8 @@ class Test80Mhz5GChannel36PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942") @pytest.mark.tcp_upload -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client TCP Upload wifi capacity 80Mhz Bw") -======= ->>>>>>> Addded peak_throughput_tests in nat mode def test_client_wpa2_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ Wifi Capacity Test BRIDGE mode @@ -175,11 +142,8 @@ class Test80Mhz5GChannel36PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945") @pytest.mark.udp_upload -<<<<<<< HEAD @pytest.mark.performance @allure.title("Single client UDP Upload wifi capacity 80Mhz Bw") -======= ->>>>>>> Addded peak_throughput_tests in nat mode def test_client_wpa2_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ Wifi Capacity Test BRIDGE mode