diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index dd736c7db..0c40e8034 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -230,7 +230,6 @@ class RunTest: upload_rate=upload_rate, download_rate=download_rate, sort="interleave", - # stations=stations, create_stations=True, radio=None, security=None, @@ -244,7 +243,6 @@ class RunTest: wificapacity_obj.setup() wificapacity_obj.run() - report_name = wificapacity_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] influx = CSVtoInflux(influxdb=self.influxdb, _influx_tag=self.influx_params["influx_tag"], target_csv=self.local_report_path + report_name + "/kpi.csv") diff --git a/libs/lanforge/lf_tools.py b/libs/lanforge/lf_tools.py index 989501450..d5644e956 100644 --- a/libs/lanforge/lf_tools.py +++ b/libs/lanforge/lf_tools.py @@ -93,28 +93,37 @@ class ChamberView: max_stations = 0 print(idx) if band == "2G": - max_stations = 64 * len(self.twog_radios) - radio = ",".join(self.twog_radios) - if len(self.twog_radios) == 1: - radio = radio + ",AUTO" - # self.eap_connect.sta_prefix = self.twog_prefix + if num_stations != "max": + num_stations = int(num_stations / len(self.twog_radios)) + for radio in self.twog_radios: + max_stations = 64 + if num_stations == "max": + num_stations = max_stations + station_data = ["profile_link 1.1 STA-AUTO " + str(num_stations) + " 'DUT: " + dut + " Radio-" + + str(int(idx) + 1) + "'" + " NA " + radio] + self.raw_line.append(station_data) + if band == "5G": - max_stations = 64 * len(self.twog_radios) - radio = ",".join(self.fiveg_radios) - if len(self.fiveg_radios) == 1: - radio = radio + ",AUTO" + if num_stations != "max": + num_stations = int(num_stations / len(self.fiveg_radios)) + for radio in self.fiveg_radios: + max_stations = 64 + if num_stations == "max": + num_stations = max_stations + station_data = ["profile_link 1.1 STA-AUTO " + str(num_stations) + " 'DUT: " + dut + " Radio-" + + str(int(idx) + 1) + "'" + " NA " + radio] + self.raw_line.append(station_data) if band == "ax": - max_stations = len(self.twog_radios) - radio = ",".join(self.fiveg_radios) - if len(self.fiveg_radios) == 1: - radio = radio + ",AUTO" - # self.eap_connect.sta_prefix = self.fiveg_prefix - if num_stations != "max": - max_stations = num_stations - station_data = ["profile_link 1.1 STA-AUTO " + str(max_stations) + " 'DUT: " + dut + " Radio-" + str(int(idx)+1) + "'" + " NA " + radio] - self.raw_line.append(station_data) - - + if num_stations != "max": + num_stations = int(num_stations / len(self.fiveg_radios)) + for radio in self.ax_radios: + max_stations = 1 + if num_stations == "max": + num_stations = max_stations + station_data = ["profile_link 1.1 STA-AUTO " + str(num_stations) + " 'DUT: " + dut + " Radio-" + + str(int(idx) + 1) + "'" + " NA " + radio] + self.raw_line.append(station_data) + print("shivam", self.raw_line) def Create_Dut(self): self.CreateDut.setup() @@ -192,4 +201,3 @@ class ChamberView: allure.attach.file(source=relevant_path + i, name=i, attachment_type="image/png", extension=None) - diff --git a/tests/configuration.py b/tests/configuration.py index 07dd5f34c..3461e53cd 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -252,7 +252,7 @@ RADIUS_SERVER_DATA = { RADIUS_ACCOUNTING_DATA = { "ip": "10.10.10.72", - "port": 1812, + "port": 1813, "secret": "testing123", "user": "user", "password": "password", diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py index 63b4a786b..413a37ef2 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py @@ -1,14 +1,14 @@ """ - Performance Test: Wifi Capacity Test : Bridge Mode - pytest -m "wifi_capacity_test and bridge" + Performance Test: Wifi Capacity Test : BRIDGE Mode + pytest -m "wifi_capacity_test and BRIDGE" """ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.wifi_capacity_test, pytest.mark.bridge] +pytestmark = [pytest.mark.performance, pytest.mark.bridge] # """pytest.mark.usefixtures("setup_test_run")"""] @@ -36,18 +36,18 @@ setup_params_general_dual_band = { @pytest.mark.twog @pytest.mark.fiveg @pytest.mark.dual_band -@pytest.mark.wct -class TestWifiCapacityBridgeModeDualBand(object): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge" +@pytest.mark.wifi_capacity_test +class TestWifiCapacityBRIDGEModeDualBand(object): + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE" """ @pytest.mark.tcp_download - def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + def test_client_wpa2_BRIDGE_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -56,10 +56,10 @@ class TestWifiCapacityBridgeModeDualBand(object): if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - lf_tools.add_stations(band="2G", num_stations="100", dut=lf_tools.dut_name, ssid_name=ssid_name) - lf_tools.add_stations(band="5G", num_stations="100", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_dl", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="0", protocol="TCP-IPv4", duration="60000") @@ -70,11 +70,11 @@ class TestWifiCapacityBridgeModeDualBand(object): assert True @pytest.mark.udp_download - def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_udp_dl(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -83,10 +83,10 @@ class TestWifiCapacityBridgeModeDualBand(object): if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - lf_tools.add_stations(band="2G", num_stations="100", dut=lf_tools.dut_name, ssid_name=ssid_name) - lf_tools.add_stations(band="5G", num_stations="100", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_dl", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="0", protocol="UDP-IPv4", duration="60000") @@ -97,11 +97,11 @@ class TestWifiCapacityBridgeModeDualBand(object): assert True @pytest.mark.tcp_bidirectional - def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_tcp_bidirectional(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -113,7 +113,7 @@ class TestWifiCapacityBridgeModeDualBand(object): lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_bi", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") @@ -124,11 +124,11 @@ class TestWifiCapacityBridgeModeDualBand(object): assert True @pytest.mark.udp_bidirectional - def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_udp_bidirectional(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -140,7 +140,7 @@ class TestWifiCapacityBridgeModeDualBand(object): lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_bi", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") @@ -173,18 +173,18 @@ setup_params_general_2G = { @pytest.mark.usefixtures("setup_profiles") @pytest.mark.wpa2_personal @pytest.mark.twog -@pytest.mark.fiveg_band -class TestWifiCapacityBridgeMode2G(object): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge" +@pytest.mark.twog_band +class TestWifiCapacityBRIDGEMode2G(object): + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE" """ @pytest.mark.tcp_download - def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + def test_client_wpa2_BRIDGE_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -195,7 +195,7 @@ class TestWifiCapacityBridgeMode2G(object): pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_dl", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="0", protocol="TCP-IPv4", duration="60000") @@ -206,11 +206,11 @@ class TestWifiCapacityBridgeMode2G(object): assert True @pytest.mark.udp_download - def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_udp_dl(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -221,7 +221,7 @@ class TestWifiCapacityBridgeMode2G(object): pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_dl", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="0", protocol="UDP-IPv4", duration="60000") @@ -232,11 +232,11 @@ class TestWifiCapacityBridgeMode2G(object): assert True @pytest.mark.tcp_bidirectional - def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_tcp_bidirectional(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -247,7 +247,7 @@ class TestWifiCapacityBridgeMode2G(object): pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_bi", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") @@ -258,11 +258,11 @@ class TestWifiCapacityBridgeMode2G(object): assert True @pytest.mark.udp_bidirectional - def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_udp_bidirectional(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -273,7 +273,7 @@ class TestWifiCapacityBridgeMode2G(object): pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_bi", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") @@ -288,7 +288,7 @@ setup_params_general_5G = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is5GHz"], "security_key": "something"} + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["5G"], "security_key": "something"} ] }, "rf": {}, @@ -307,17 +307,17 @@ setup_params_general_5G = { @pytest.mark.wpa2_personal @pytest.mark.fiveg @pytest.mark.fiveg_band -class TestWifiCapacityBridgeMode5G(object): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge" +class TestWifiCapacityBRIDGEMode5G(object): + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE" """ @pytest.mark.tcp_download - def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + def test_client_wpa2_BRIDGE_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -328,7 +328,7 @@ class TestWifiCapacityBridgeMode5G(object): pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_dl", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="0", protocol="TCP-IPv4", duration="60000") @@ -339,11 +339,11 @@ class TestWifiCapacityBridgeMode5G(object): assert True @pytest.mark.udp_download - def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_udp_dl(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -354,7 +354,7 @@ class TestWifiCapacityBridgeMode5G(object): pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_dl", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="0", protocol="UDP-IPv4", duration="60000") @@ -365,11 +365,11 @@ class TestWifiCapacityBridgeMode5G(object): assert True @pytest.mark.tcp_bidirectional - def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_tcp_bidirectional(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -380,7 +380,7 @@ class TestWifiCapacityBridgeMode5G(object): pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_bi", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") @@ -391,11 +391,11 @@ class TestWifiCapacityBridgeMode5G(object): assert True @pytest.mark.udp_bidirectional - def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools, + def test_client_wpa2_BRIDGE_udp_bidirectional(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): - """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ Wifi Capacity Test BRIDGE mode + pytest -m "wifi_capacity_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -406,7 +406,7 @@ class TestWifiCapacityBridgeMode5G(object): pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_bi", mode=mode, vlan_id=vlan, + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_nat_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_nat_mode.py index 668e2ced9..c2cd1527f 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_nat_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.wifi_capacity_test, pytest.mark.nat] +pytestmark = [pytest.mark.performance, pytest.mark.nat] # """pytest.mark.usefixtures("setup_test_run")"""] @@ -36,7 +36,7 @@ setup_params_general_dual_band = { @pytest.mark.twog @pytest.mark.fiveg @pytest.mark.dual_band -@pytest.mark.wct_n +@pytest.mark.wifi_capacity_test class TestWifiCapacityNATModeDualBand(object): """ Wifi Capacity Test NAT mode pytest -m "wifi_capacity_test and NAT" @@ -56,8 +56,8 @@ class TestWifiCapacityNATModeDualBand(object): if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - lf_tools.add_stations(band="2G", num_stations="100", dut=lf_tools.dut_name, ssid_name=ssid_name) - lf_tools.add_stations(band="5G", num_stations="100", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", @@ -83,8 +83,8 @@ class TestWifiCapacityNATModeDualBand(object): if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - lf_tools.add_stations(band="2G", num_stations="100", dut=lf_tools.dut_name, ssid_name=ssid_name) - lf_tools.add_stations(band="5G", num_stations="100", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", @@ -173,7 +173,7 @@ setup_params_general_2G = { @pytest.mark.usefixtures("setup_profiles") @pytest.mark.wpa2_personal @pytest.mark.twog -@pytest.mark.fiveg_band +@pytest.mark.twog_band class TestWifiCapacityNATMode2G(object): """ Wifi Capacity Test NAT mode pytest -m "wifi_capacity_test and NAT" @@ -288,7 +288,7 @@ setup_params_general_5G = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is5GHz"], "security_key": "something"} + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["5G"], "security_key": "something"} ] }, "rf": {}, diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_vlan_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_vlan_mode.py index 3e2b8064f..6af258e1b 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_vlan_mode.py @@ -1,14 +1,14 @@ """ Performance Test: Wifi Capacity Test : VLAN Mode - pytest -m "wifi_capacity_test and vlan" + pytest -m "wifi_capacity_test and VLAN" """ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.vlan] +pytestmark = [pytest.mark.performance, pytest.mark.VLAN] # """pytest.mark.usefixtures("setup_test_run")"""] @@ -43,15 +43,15 @@ class TestWifiCapacityVLANModeDualBand(object): @pytest.mark.tcp_download def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -70,15 +70,15 @@ class TestWifiCapacityVLANModeDualBand(object): @pytest.mark.udp_download def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -97,15 +97,15 @@ class TestWifiCapacityVLANModeDualBand(object): @pytest.mark.tcp_bidirectional def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -124,15 +124,15 @@ class TestWifiCapacityVLANModeDualBand(object): @pytest.mark.udp_bidirectional def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -172,7 +172,7 @@ setup_params_general_2G = { @pytest.mark.usefixtures("setup_profiles") @pytest.mark.wpa2_personal @pytest.mark.twog -@pytest.mark.fiveg_band +@pytest.mark.twog_band class TestWifiCapacityVLANMode2G(object): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN" @@ -180,15 +180,15 @@ class TestWifiCapacityVLANMode2G(object): @pytest.mark.tcp_download def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -206,15 +206,15 @@ class TestWifiCapacityVLANMode2G(object): @pytest.mark.udp_download def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -232,15 +232,15 @@ class TestWifiCapacityVLANMode2G(object): @pytest.mark.tcp_bidirectional def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -258,15 +258,15 @@ class TestWifiCapacityVLANMode2G(object): @pytest.mark.udp_bidirectional def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -287,7 +287,7 @@ setup_params_general_5G = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is5GHz"], "security_key": "something"} + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["5G"], "security_key": "something"} ] }, "rf": {}, @@ -313,15 +313,15 @@ class TestWifiCapacityVLANMode5G(object): @pytest.mark.tcp_download def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -339,15 +339,15 @@ class TestWifiCapacityVLANMode5G(object): @pytest.mark.udp_download def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -365,15 +365,15 @@ class TestWifiCapacityVLANMode5G(object): @pytest.mark.tcp_bidirectional def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -391,15 +391,15 @@ class TestWifiCapacityVLANMode5G(object): @pytest.mark.udp_bidirectional def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test VLAN mode pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] mode = "VLAN" - vlan = 1 + vlan = 100 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")