From 4f1a267e32ab51d7e9818c70d1f81b88b97ec0ce Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Thu, 24 Nov 2022 17:43:29 +0530 Subject: [PATCH] Adjusted parameters in rate limiting for perfecto interop Signed-off-by: jitendracandela --- .../rate_limiting/test_rate_limiting.py | 121 +++++++++++++--- .../rate_limiting/test_rate_limiting.py | 120 +++++++++++++--- .../rate_limiting/test_rate_limiting.py | 130 +++++++++++++++--- 3 files changed, 310 insertions(+), 61 deletions(-) diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py index 1553a8e90..ea2300a34 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py @@ -67,12 +67,16 @@ class TestRateLimitingBridge(object): }} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}) + num_stations={"2G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) print("Test Completed... Cleaning up Stations") assert True @@ -98,12 +102,16 @@ class TestRateLimitingBridge(object): }} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_dw", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}) + num_stations={"2G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) print("Test Completed... Cleaning up Stations") assert True @@ -131,12 +139,16 @@ class TestRateLimitingBridge(object): }} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_dw", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}) + num_stations={"2G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -164,12 +176,16 @@ class TestRateLimitingBridge(object): profile_data["rate-limit"][0] = 0 profile_data["rate-limit"][1] = 0 mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_dw_di", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}) + num_stations={"2G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -195,13 +211,17 @@ class TestRateLimitingBridge(object): }} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["dl_rate_sel: Per-Station Download Rate:"], ["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_bridge_up_dw_per_cl", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines) + num_stations={"2G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @pytest.mark.wpa2_personal @@ -226,13 +246,17 @@ class TestRateLimitingBridge(object): }} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_per_cl", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines) + num_stations={"2G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -258,13 +282,17 @@ class TestRateLimitingBridge(object): }} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["dw_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_dw_per_cl", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines) + num_stations={"2G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -290,12 +318,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_125", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}) + num_stations={"5G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -321,13 +353,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" - vlan = 1 + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_dw_125", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}) + num_stations={"5G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -354,12 +389,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_dw_125", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}) + num_stations={"5G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -385,12 +424,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_1", mode=mode, download_rate="0Gbps", 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}) + num_stations={"2G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -416,12 +459,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_1", mode=mode, download_rate="1Gbps", batch_size="1", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 1}) + num_stations={"2G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -447,12 +494,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_tcp_dl_up_dw_1", mode=mode, download_rate="1Gbps", 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}) + num_stations={"2G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -478,12 +529,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_1_5g", mode=mode, download_rate="0Gbps", 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}) + num_stations={"5G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -509,12 +564,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_dw_1_5g", mode=mode, download_rate="1Gbps", batch_size="1", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 1}) + num_stations={"5G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -540,12 +599,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_dw_1_5g", mode=mode, download_rate="1Gbps", 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}) + num_stations={"5G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -573,12 +636,16 @@ class TestRateLimitingBridge(object): profile_data["rate-limit"][0] = 0 profile_data["rate-limit"][1] = 0 mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_dw_di_5g", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}) + num_stations={"5G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -604,13 +671,17 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["dl_rate_sel: Per-Station Download Rate:"], ["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_per_cl_5g", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines) + num_stations={"5G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -636,13 +707,17 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_up_per_cl_5g", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines) + num_stations={"5G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -668,12 +743,16 @@ class TestRateLimitingBridge(object): } ssid_name = profile_data["ssid_name"] mode = "BRIDGE" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["dw_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_BRIDGE_dw_per_cl_5g", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines) + num_stations={"5G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py index cff403052..7e56ed6f8 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py @@ -67,12 +67,16 @@ class TestRateLimitingNAT(object): }} ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}) + num_stations={"2G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) print("Test Completed... Cleaning up Stations") assert True @@ -98,12 +102,16 @@ class TestRateLimitingNAT(object): }} ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_dw", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}) + num_stations={"2G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) print("Test Completed... Cleaning up Stations") assert True @@ -131,12 +139,16 @@ class TestRateLimitingNAT(object): }} ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_dw", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}) + num_stations={"2G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -164,12 +176,16 @@ class TestRateLimitingNAT(object): profile_data["rate-limit"][0] = 0 profile_data["rate-limit"][1] = 0 mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_dw_di", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}) + num_stations={"2G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -195,13 +211,17 @@ class TestRateLimitingNAT(object): }} ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["dl_rate_sel: Per-Station Download Rate:"], ["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_dw_per_cl", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines) + num_stations={"2G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @pytest.mark.wpa2_personal @@ -226,13 +246,17 @@ class TestRateLimitingNAT(object): }} ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_per_cl", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines) + num_stations={"2G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -258,13 +282,17 @@ class TestRateLimitingNAT(object): }} ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["dw_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_dw_per_cl", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines) + num_stations={"2G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -290,12 +318,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_125", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}) + num_stations={"5G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -321,12 +353,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_dw_125", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}) + num_stations={"5G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -352,12 +388,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_dw_125", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}) + num_stations={"5G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -383,12 +423,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_1", mode=mode, download_rate="0Gbps", 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}) + num_stations={"2G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -414,12 +458,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_1", mode=mode, download_rate="1Gbps", batch_size="1", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 1}) + num_stations={"2G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -445,12 +493,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_tcp_dl_up_dw_1", mode=mode, download_rate="1Gbps", 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}) + num_stations={"2G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -476,12 +528,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_1_5g", mode=mode, download_rate="0Gbps", 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}) + num_stations={"5G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -507,12 +563,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_dw_1_5g", mode=mode, download_rate="1Gbps", batch_size="1", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 1}) + num_stations={"5G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -538,12 +598,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_dw_1_5g", mode=mode, download_rate="1Gbps", 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}) + num_stations={"5G": 1}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -571,12 +635,16 @@ class TestRateLimitingNAT(object): profile_data["rate-limit"][0] = 0 profile_data["rate-limit"][1] = 0 mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_dw_di_5g", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}) + num_stations={"5G": 5}, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -602,13 +670,17 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["dl_rate_sel: Per-Station Download Rate:"], ["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_per_cl_5g", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines) + num_stations={"5G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -634,13 +706,17 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_up_per_cl_5g", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines) + num_stations={"5G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -666,12 +742,16 @@ class TestRateLimitingNAT(object): } ssid_name = profile_data["ssid_name"] mode = "NAT-WAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] raw_lines = [["dw_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_NAT_dw_per_cl_5g", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines) + num_stations={"5G": 5}, raw_lines=raw_lines, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py index 6c029246c..450e7c6df 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py @@ -70,13 +70,17 @@ class TestRateLimitingVLAN(object): }} ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, vlan_id=vlan) + num_stations={"2G": 5}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) print("Test Completed... Cleaning up Stations") assert True @@ -102,13 +106,17 @@ class TestRateLimitingVLAN(object): }} ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_dw", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, vlan_id=vlan) + num_stations={"2G": 5}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) print("Test Completed... Cleaning up Stations") assert True @@ -136,13 +144,17 @@ class TestRateLimitingVLAN(object): }} ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_dw", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, vlan_id=vlan) + num_stations={"2G": 5}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -170,13 +182,17 @@ class TestRateLimitingVLAN(object): profile_data["rate-limit"][0] = 0 profile_data["rate-limit"][1] = 0 mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_dw_di", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, vlan_id=vlan) + num_stations={"2G": 5}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -202,6 +218,9 @@ class TestRateLimitingVLAN(object): }} ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] raw_lines = [["dl_rate_sel: Per-Station Download Rate:"], ["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) @@ -209,7 +228,8 @@ class TestRateLimitingVLAN(object): download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines, vlan_id=vlan) + num_stations={"2G": 5}, raw_lines=raw_lines, vlan_id=vlan, passkey=passkey, + up_rate=up_rate, down_rate=down_rate) assert True @pytest.mark.wpa2_personal @@ -234,6 +254,9 @@ class TestRateLimitingVLAN(object): }} ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] raw_lines = [["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) @@ -241,7 +264,10 @@ class TestRateLimitingVLAN(object): download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines, vlan_id=vlan) + num_stations={"2G": 5}, raw_lines=raw_lines, vlan_id=vlan, + passkey=passkey, up_rate=up_rate, + down_rate=down_rate + ) assert True @@ -267,6 +293,9 @@ class TestRateLimitingVLAN(object): }} ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] raw_lines = [["dw_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) @@ -274,7 +303,10 @@ class TestRateLimitingVLAN(object): download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 5}, raw_lines=raw_lines, vlan_id=vlan) + num_stations={"2G": 5}, raw_lines=raw_lines, vlan_id=vlan, + passkey=passkey, up_rate=up_rate, + down_rate=down_rate + ) assert True @@ -300,13 +332,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_125", mode=mode, download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, vlan_id=vlan) + num_stations={"5G": 5}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -332,13 +368,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_dw_125", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, vlan_id=vlan) + num_stations={"5G": 5}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -365,13 +405,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_dw_125", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, vlan_id=vlan) + num_stations={"5G": 5}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -397,13 +441,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_1", mode=mode, download_rate="0Gbps", 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}, vlan_id=vlan) + num_stations={"2G": 1}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -429,13 +477,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_1", mode=mode, download_rate="1Gbps", batch_size="1", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"2G": 1}, vlan_id=vlan) + num_stations={"2G": 1}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -461,13 +513,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_tcp_dl_up_dw_1", mode=mode, download_rate="1Gbps", 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}, vlan_id=vlan) + num_stations={"2G": 1}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -493,13 +549,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_1_5g", mode=mode, download_rate="0Gbps", 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}, vlan_id=vlan) + num_stations={"5G": 1}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -525,13 +585,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_dw_1_5g", mode=mode, download_rate="1Gbps", batch_size="1", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 1}, vlan_id=vlan) + num_stations={"5G": 1}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -557,13 +621,17 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_dw_1_5g", mode=mode, download_rate="1Gbps", 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}, vlan_id=vlan) + num_stations={"5G": 1}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -591,13 +659,17 @@ class TestRateLimitingVLAN(object): profile_data["rate-limit"][0] = 0 profile_data["rate-limit"][1] = 0 mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) get_test_library.rate_limiting_test(instance_name="test_client_wpa2_VLAN_up_dw_di_5g", mode=mode, download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, vlan_id=vlan) + num_stations={"5G": 5}, vlan_id=vlan, passkey=passkey, up_rate=up_rate, + down_rate=down_rate) assert True @@ -623,6 +695,9 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] raw_lines = [["dl_rate_sel: Per-Station Download Rate:"], ["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) @@ -630,7 +705,10 @@ class TestRateLimitingVLAN(object): download_rate="1Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines, vlan_id=vlan) + num_stations={"5G": 5}, raw_lines=raw_lines, vlan_id=vlan, + passkey=passkey, up_rate=up_rate, + down_rate=down_rate + ) assert True @@ -656,6 +734,9 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] raw_lines = [["ul_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) @@ -663,7 +744,10 @@ class TestRateLimitingVLAN(object): download_rate="0Gbps", batch_size="1,2,5", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines, vlan_id=vlan) + num_stations={"5G": 5}, raw_lines=raw_lines, vlan_id=vlan, + passkey=passkey, up_rate=up_rate, + down_rate=down_rate + ) assert True @@ -689,6 +773,9 @@ class TestRateLimitingVLAN(object): } ssid_name = profile_data["ssid_name"] mode = "VLAN" + passkey = profile_data["security_key"] + up_rate = profile_data["rate-limit"]["ingress-rate"] + down_rate = profile_data["rate-limit"]["egress-rate"] vlan = [100] raw_lines = [["dw_rate_sel: Per-Station Download Rate:"]] allure.attach(name="ssid-rates", body=str(profile_data["rate-limit"])) @@ -696,6 +783,9 @@ class TestRateLimitingVLAN(object): download_rate="1Gbps", batch_size="1,2,5", upload_rate="0Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name, - num_stations={"5G": 5}, raw_lines=raw_lines, vlan_id=vlan) + num_stations={"5G": 5}, raw_lines=raw_lines, vlan_id=vlan, + passkey=passkey, up_rate=up_rate, + down_rate=down_rate + ) assert True