diff --git a/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py b/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py index 251d2f9a6..8903a2e3b 100644 --- a/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py +++ b/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py @@ -53,9 +53,9 @@ class Test_RatevsRange_Bridge(object): dut_data=setup_configuration, num_sta=1, direction="DUT Transmit", instance_name="BRIDGE_RVR_TWOG_DL", - pass_value={"strong": 100, "medium": 95, "weak": 14}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54, 57, 60, 63]) + pass_value={"strong": 100, "medium": 45, "weak": 3}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49]) if result: assert True else: @@ -81,9 +81,9 @@ class Test_RatevsRange_Bridge(object): dut_data=setup_configuration, num_sta=1, direction="DUT Receive", instance_name="BRIDGE_RVR_TWOG_UL", - pass_value={"strong": 100, "medium": 95, "weak": 14}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54, 57, 60, 63]) + pass_value={"strong": 100, "medium": 31, "weak": 3}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49]) if result: assert True else: @@ -109,9 +109,9 @@ class Test_RatevsRange_Bridge(object): dut_data=setup_configuration, num_sta=1, direction="DUT Transmit", instance_name="BRIDGE_RVR_FIVEG_DL", - pass_value={"strong": 560, "medium": 220, "weak": 5}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54]) + pass_value={"strong": 560, "medium": 300, "weak": 45}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49]) if result: assert True else: @@ -138,9 +138,9 @@ class Test_RatevsRange_Bridge(object): dut_data=setup_configuration, num_sta=1, direction="DUT Receive", instance_name="BRIDGE_RVR_FIVEG_UL", - pass_value={"strong": 560, "medium": 220, "weak": 5}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54]) + pass_value={"strong": 560, "medium": 300, "weak": 45}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49]) if result: assert True else: diff --git a/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_nat_mode.py b/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_nat_mode.py index 2bd294ae6..ca72c77a0 100644 --- a/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_nat_mode.py +++ b/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_nat_mode.py @@ -6,7 +6,7 @@ import pytest import allure -pytestmark = [pytest.mark.advance, pytest.mark.rate_vs_range, pytest.mark.nat] +pytestmark = [pytest.mark.rate_vs_range, pytest.mark.nat] setup_params_general = { @@ -53,9 +53,9 @@ class Test_RatevsRange_Nat(object): dut_data=setup_configuration, num_sta=1, direction="DUT Transmit", instance_name="NAT_RVR_TWOG_DL", - pass_value={"strong": 100, "medium": 95, "weak": 14}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54, 57, 60, 63]) + pass_value={"strong": 100, "medium": 45, "weak": 3}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49]) if result: assert True else: @@ -81,9 +81,9 @@ class Test_RatevsRange_Nat(object): dut_data=setup_configuration, num_sta=1, direction="DUT Receive", instance_name="NAT_RVR_TWOG_UL", - pass_value={"strong": 100, "medium": 95, "weak": 14}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54, 57, 60, 63]) + pass_value={"strong": 100, "medium": 31, "weak": 3}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49]) if result: assert True else: @@ -110,9 +110,9 @@ class Test_RatevsRange_Nat(object): dut_data=setup_configuration, num_sta=1, direction="DUT Transmit", instance_name="NAT_RVR_FIVEG_DL", - pass_value={"strong": 560, "medium": 220, "weak": 5}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54]) + pass_value={"strong": 560, "medium": 300, "weak": 45}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49]) if result: assert True else: @@ -139,9 +139,9 @@ class Test_RatevsRange_Nat(object): dut_data=setup_configuration, num_sta=1, direction="DUT Receive", instance_name="NAT_RVR_FIVEG_UL", - pass_value={"strong": 560, "medium": 220, "weak": 5}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54]) + pass_value={"strong": 560, "medium": 300, "weak": 45}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49]) if result: assert True else: diff --git a/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_vlan_mode.py b/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_vlan_mode.py index 017a3c191..e91554b18 100644 --- a/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_vlan_mode.py +++ b/tests/e2e/advanced/rate_vs_range/wpa2_personal/test_vlan_mode.py @@ -6,7 +6,7 @@ import pytest import allure -pytestmark = [pytest.mark.advance, pytest.mark.rate_vs_range, pytest.mark.vlan] +pytestmark = [pytest.mark.rate_vs_range, pytest.mark.vlan] setup_params_general = { @@ -53,9 +53,9 @@ class Test_RatevsRange_Vlan(object): dut_data=setup_configuration, num_sta=1, direction="DUT Transmit", instance_name="VLAN_RVR_TWOG_DL", - pass_value={"strong": 100, "medium": 95, "weak": 14}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54, 57, 60, 63],create_vlan=False) + pass_value={"strong": 100, "medium": 45, "weak": 3}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49],create_vlan=False) if result: assert True else: @@ -81,9 +81,9 @@ class Test_RatevsRange_Vlan(object): dut_data=setup_configuration, num_sta=1, direction="DUT Receive", instance_name="VLAN_RVR_TWOG_DL", - pass_value={"strong": 100, "medium": 95, "weak": 14}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54, 57, 60, 63],create_vlan=False) + pass_value={"strong": 100, "medium": 31, "weak": 3}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49],create_vlan=False) if result: assert True else: @@ -110,9 +110,9 @@ class Test_RatevsRange_Vlan(object): dut_data=setup_configuration, num_sta=1, direction="DUT Transmit", instance_name="VLAN_RVR_FIVEG_DL", - pass_value={"strong": 560, "medium": 220, "weak": 5}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54],create_vlan=False) + pass_value={"strong": 560, "medium": 300, "weak": 45}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49],create_vlan=False) if result: assert True else: @@ -138,9 +138,9 @@ class Test_RatevsRange_Vlan(object): dut_data=setup_configuration, num_sta=1, direction="DUT Receive", instance_name="VLAN_RVR_FIVEG_UL", - pass_value={"strong": 560, "medium": 220, "weak": 5}, - attenuations=[0, 10, 21, 24, 27, 30, 33, 36, 39, 42, - 45, 48, 51, 54],create_vlan=False) + pass_value={"strong": 560, "medium": 300, "weak": 45}, + attenuations=[0, 6, 12, 18, 24, 30, 36, 39, 41, 43, + 45, 47, 49],create_vlan=False) if result: assert True else: