From 6c0e0cb701e0cbf4e03fb42d9178c963d7b19136 Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Tue, 20 Sep 2022 19:12:05 +0530 Subject: [PATCH 1/2] Added ow_sanity_lf marker for channel 11 Signed-off-by: jitendracandela --- .../test_peak_throughput_wpa2_40Mhz_2g.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 447e347f3..42cc41aa8 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 @@ -42,11 +42,6 @@ class Test20Mhz2GChannel1PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") @pytest.mark.tcp_download - @pytest.mark.ow_sanity_lf - @allure.parent_suite("Throughput Test") - @allure.suite("2.4 Ghz Band") - @allure.title("Single client TCP Download wifi capacity 40Mhz Bw") - @allure.sub_suite("BRIDGE Mode") 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 @@ -1368,7 +1363,11 @@ class Test20Mhz2GChannel11PeakThroughput(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934") @pytest.mark.tcp_download - @pytest.mark.aaa + @pytest.mark.ow_sanity_lf + @allure.parent_suite("Throughput Test") + @allure.suite("2.4 Ghz Band") + @allure.title("Single client TCP Download wifi capacity 40Mhz Bw") + @allure.sub_suite("BRIDGE Mode") 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 From a2a0c50e0409b49f11256311279f7340dd0fc9ad Mon Sep 17 00:00:00 2001 From: tarun-candela Date: Tue, 20 Sep 2022 19:18:45 +0530 Subject: [PATCH 2/2] Added rate-limiting test_cases --- .../bridge_mode/rate_limiting/__init__.py | 0 .../rate_limiting/test_rate_limiting.py | 237 ++++++++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/__init__.py create mode 100644 tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/__init__.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py new file mode 100644 index 000000000..90434f7a1 --- /dev/null +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py @@ -0,0 +1,237 @@ +""" + Rate Limiting : BRIDGE Mode + pytest -m "rate_limiting_tests" + +""" +import logging + +import allure +import pytest + +pytestmark = [pytest.mark.rate_limiting_tests, pytest.mark.bridge, pytest.mark.general] + +setup_params_general = { + "mode": "BRIDGE", + "ssid_modes": { + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2_2g_RL", + "appliedRadios": ["2G"], + "security_key": "something", + "rate-limit": { + "ingress-rate": 60, + "egress-rate": 10 + } + }, + {"ssid_name": "ssid_wpa2_5g_RL", + "appliedRadios": ["5G"], + "security_key": "something", + "rate-limit": { + "ingress-rate": 60, + "egress-rate": 10 + } + } + ], + "wpa": [ + {"ssid_name": "ssid_wpa_2g_RL", + "appliedRadios": ["2G"], + "security_key": "something", + "rate-limit": { + "ingress-rate": 60, + "egress-rate": 10 + } + }, + {"ssid_name": "ssid_wpa_5g_RL", + "appliedRadios": ["5G"], + "security_key": "something", + "rate-limit": { + "ingress-rate": 60, + "egress-rate": 10 + } + } + ], + "wpa3_personal": [ + {"ssid_name": "ssid_wpa3_2g_RL", + "appliedRadios": ["2G"], + "security_key": "something", + "rate-limit": { + "ingress-rate": 60, + "egress-rate": 10 + } + }, + {"ssid_name": "ssid_wpa3_5g_RL", + "appliedRadios": ["5G"], + "security_key": "something", + "rate-limit": { + "ingress-rate": 60, + "egress-rate": 10 + } + } + ] + }, + "rf": {}, + "radius": False +} + +@allure.feature("BRIDGE MODE RATE LIMITING") +@allure.parent_suite("Rate Limiting Tests") +@allure.suite(suite_name="BRIDGE Mode") +@allure.sub_suite(sub_suite_name="General security mode Rate Limiting") +@pytest.mark.parametrize( + 'setup_configuration', + [setup_params_general], + indirect=True, + scope="class" +) +@pytest.mark.usefixtures("setup_configuration") +class TestRateLimitingBridge(object): + """ + Bridge Rate Limiting (wpa. wpa2. wpa3) (twog, fiveg) + pytest -m "rate_limiting_tests and bridge and general" + """ + + @pytest.mark.wpa + @pytest.mark.twog + @allure.story('wpa 2.4 GHZ Band') + @allure.title("BRIDGE Mode Rate Limiting Test with wpa encryption 2.4 GHz Band") + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-7008", name="JIRA LINK") + def test_rate_limiting_wpa_2g(self, get_dut_logs_per_test_case, get_test_device_logs, + num_stations, setup_configuration, get_test_library): + """ + BRIDGE Mode Rate Limiting Test with wpa encryption 2.4 GHz Band + pytest -m "rate_limiting_tests and bridge and general and wpa and twog" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] + security = "wpa" + mode = "BRIDGE" + band = "twog" + + passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + down_rate=down_rate) + assert passes == "PASS", result + + @pytest.mark.wpa + @pytest.mark.fiveg + @allure.story('wpa 5 GHZ Band') + @allure.title("BRIDGE Mode Rate Limiting Test with wpa encryption 5 GHz Band") + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-7009",name="JIRA LINK") + def test_rate_limiting_wpa_5g(self, get_dut_logs_per_test_case, get_test_device_logs, + num_stations, setup_configuration, get_test_library): + """ + BRIDGE Mode Rate Limiting Test with wpa encryption 5 GHz Band + pytest -m "rate_limiting_tests and bridge and general and wpa and fiveg" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] + security = "wpa" + mode = "BRIDGE" + band = "fiveg" + + passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + down_rate=down_rate) + assert passes == "PASS", result + + @pytest.mark.wpa2_personal + @pytest.mark.twog + @allure.story('wpa2_personal 2.4 GHZ Band') + @allure.title("BRIDGE Mode Rate Limiting Test with wpa2_personal encryption 2.4 GHz Band") + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-7008", name="JIRA LINK") + def test_rate_limiting_wpa2_2g(self, get_dut_logs_per_test_case, get_test_device_logs, + num_stations, setup_configuration, get_test_library): + """ + BRIDGE Mode Rate Limiting Test with wpa2_personal encryption 2.4 GHz Band + pytest -m "rate_limiting_tests and bridge and general and wpa2_personal and twog" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] + security = "wpa2" + mode = "BRIDGE" + band = "twog" + + passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + down_rate=down_rate) + assert passes == "PASS", result + + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + @allure.story('wpa2_personal 5 GHZ Band') + @allure.title("BRIDGE Mode Rate Limiting Test with wpa2_personal encryption 5 GHz Band") + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-7009", name="JIRA LINK") + def test_rate_limiting_wpa2_5g(self, get_dut_logs_per_test_case, get_test_device_logs, + num_stations, setup_configuration, get_test_library): + """ + BRIDGE Mode Rate Limiting Test with wpa2_personal encryption 5 GHz Band + pytest -m "rate_limiting_tests and bridge and general and wpa2_personal and fiveg" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] + security = "wpa2" + mode = "BRIDGE" + band = "fiveg" + + passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + down_rate=down_rate) + assert passes == "PASS", result + + @pytest.mark.wpa3_personal + @pytest.mark.twog + @allure.story('wpa3_personal 2.4 GHZ Band') + @allure.title("BRIDGE Mode Rate Limiting Test with wpa3_personal encryption 2.4 GHz Band") + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-7008", name="JIRA LINK") + def test_rate_limiting_wpa3_2g(self, get_dut_logs_per_test_case, get_test_device_logs, + num_stations, setup_configuration, get_test_library): + """ + BRIDGE Mode Rate Limiting Test with wpa3_personal encryption 2.4 GHz Band + pytest -m "rate_limiting_tests and bridge and general and wpa3_personal and twog" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] + security = "wpa3" + mode = "BRIDGE" + band = "twog" + + passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + down_rate=down_rate) + assert passes == "PASS", result + + @pytest.mark.wpa3_personal + @pytest.mark.fiveg + @allure.story('wpa3_personal 5 GHZ Band') + @allure.title("BRIDGE Mode Rate Limiting Test with wpa3_personal encryption 5 GHz Band") + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-7009", name="JIRA LINK") + def test_rate_limiting_wpa3_5g(self, get_dut_logs_per_test_case, get_test_device_logs, + num_stations, setup_configuration, get_test_library): + """ + BRIDGE Mode Rate Limiting Test with wpa3_personal encryption 5 GHz Band + pytest -m "rate_limiting_tests and bridge and general and wpa3_personal and fiveg" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] + security = "wpa3" + mode = "BRIDGE" + band = "fiveg" + + passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + down_rate=down_rate) + assert passes == "PASS", result + + +