From 5f86864770667aa75a2ce72ef83a4858c97a8fca Mon Sep 17 00:00:00 2001 From: jitendracandela <78074038+jitendracandela@users.noreply.github.com> Date: Sun, 17 Apr 2022 13:29:16 +0530 Subject: [PATCH] Wifi 7568 (#462) * Added ap firmware version and modified dut information Signed-off-by: jitendracandela * Added get ap version and modified lf_tools Signed-off-by: jitendracandela * Added tags and added sets in wifi capacity Signed-off-by: jitendracandela * Changed logic for ap version Signed-off-by: jitendracandela * Added influx tags, removed get_vif_state, changed method name Signed-off-by: jitendracandela * Added influx tags Signed-off-by: jitendracandela * Added influx tags Signed-off-by: jitendracandela * Changd influx tags values and Added sets Signed-off-by: jitendracandela --- libs/lanforge/lf_tests.py | 13 ++++--- libs/lanforge/lf_tools.py | 9 +++-- tests/conftest.py | 8 +++-- .../wpa2_security/test_bridge_mode.py | 25 +++++++------ .../wpa2_security/test_nat_mode.py | 20 ++++++----- .../wpa2_personal/test_bridge_mode.py | 5 +-- .../wpa2_personal/test_nat_mode.py | 3 +- .../wpa2_personal/test_bridge_mode.py | 36 ++++++++++++------- .../wpa2_personal/test_nat_mode.py | 36 ++++++++++++------- 9 files changed, 97 insertions(+), 58 deletions(-) diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index 153e7fcf7..0acc5e61b 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -339,9 +339,9 @@ class RunTest: return self.eap_connect.passes() def wifi_capacity(self, mode="BRIDGE", vlan_id=100, batch_size="1,5,10,20,40,64,128", - instance_name="wct_instance", download_rate="1Gbps", influx_tags=[], + instance_name="wct_instance", download_rate="1Gbps", influx_tags="", upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000", stations="", create_stations=True, - sort="interleave", raw_lines=[]): + sort="interleave", raw_lines=[], sets=[]): instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) if mode == "BRIDGE": upstream_port = self.upstream_port @@ -378,7 +378,8 @@ class RunTest: disables=[], raw_lines=raw_lines, raw_lines_file="", - sets=[]) + test_tag=influx_tags, + sets=sets) wificapacity_obj.setup() wificapacity_obj.run() for tag in influx_tags: @@ -504,7 +505,7 @@ class RunTest: return True def dataplane(self, station_name=None, mode="BRIDGE", vlan_id=100, download_rate="85%", dut_name="TIP", - upload_rate="0", duration="15s", instance_name="test_demo", raw_lines=None): + upload_rate="0", duration="15s", instance_name="test_demo", raw_lines=None, influx_tags=""): instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) if mode == "BRIDGE": @@ -545,6 +546,7 @@ class RunTest: duration=duration, dut=dut_name, station="1.1." + station_name[0], + test_tag=influx_tags, raw_lines=raw_lines) self.dataplane_obj.setup() @@ -563,7 +565,7 @@ class RunTest: return self.dataplane_obj def dualbandperformancetest(self, ssid_5G="[BLANK]", ssid_2G="[BLANK]", mode="BRIDGE", vlan_id=100, dut_name="TIP", - instance_name="test_demo", dut_5g="", dut_2g=""): + instance_name="test_demo", dut_5g="", dut_2g="", influx_tags=""): instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) if mode == "BRIDGE": @@ -591,6 +593,7 @@ class RunTest: max_stations_dual=124, radio2=[self.twog_radios], radio5=[self.fiveg_radios], + test_tag=influx_tags, sets=[['Basic Client Connectivity', '0'], ['Multi Band Performance', '1'], ['Throughput vs Pkt Size', '0'], ['Capacity', '0'], ['Skip 2.4Ghz Tests', '1'], diff --git a/libs/lanforge/lf_tools.py b/libs/lanforge/lf_tools.py index 84a6bebd2..4e710a5c1 100755 --- a/libs/lanforge/lf_tools.py +++ b/libs/lanforge/lf_tools.py @@ -43,7 +43,7 @@ LOGGER.addHandler(stdout_handler) class ChamberView: - def __init__(self, lanforge_data=None, access_point_data=None, run_lf=False, debug=True, testbed=None): + def __init__(self, lanforge_data=None, access_point_data=None, run_lf=False, debug=True, testbed=None, ap_version=None): print("lanforge data", lanforge_data) print("access point data", access_point_data) self.access_point_data = access_point_data @@ -192,6 +192,7 @@ class ChamberView: self.exit_on_error = False self.dut_idx_mapping = {} self.ssid_list = [] + self.ap_version = ap_version self.staConnect = StaConnect2(self.lanforge_ip, self.lanforge_port, debug_=self.debug) self.raw_line = [ ["profile_link " + self.upstream_resources + " upstream-dhcp 1 NA NA " + self.upstream_port.split(".") @@ -208,7 +209,9 @@ class ChamberView: # for DUT self.dut_name = testbed self.ap_model = access_point_data[0]["model"] - self.version = access_point_data[0]["version"].split("/")[-1] + self.ap_hw_info = access_point_data[0]["mode"] + self.version = self.ap_version[0].split(" / ")[1].split("\r\n\n")[0] + print("AP version", self.version) self.serial = access_point_data[0]["serial"] self.ssid_data = None if self.run_lf: @@ -217,7 +220,7 @@ class ChamberView: port=self.lanforge_port, dut_name=self.testbed, sw_version=self.version, - hw_version=self.ap_model, + hw_version=self.ap_hw_info, model_num=self.ap_model, serial_num=self.serial ) diff --git a/tests/conftest.py b/tests/conftest.py index 1ce0f9d99..f1c58360d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -293,6 +293,10 @@ def get_uci_show(fixtures_ver, get_apnos, get_configuration): uci_show = fixtures_ver.get_uci_show(get_apnos, get_configuration) yield uci_show +@pytest.fixture(scope="session") +def get_ap_version(fixtures_ver, get_apnos, get_configuration): + ap_version = fixtures_ver.get_ap_version(get_apnos, get_configuration) + yield ap_version @pytest.fixture(scope="session") def skip_lf(request): @@ -601,12 +605,12 @@ def create_lanforge_chamberview_dut(lf_tools, skip_lf, run_lf): @pytest.fixture(scope="session") -def lf_tools(get_configuration, testbed, skip_lf, run_lf): +def lf_tools(get_configuration, testbed, skip_lf, run_lf, get_ap_version): """ Create a DUT on LANforge""" if not skip_lf: obj = ChamberView(lanforge_data=get_configuration["traffic_generator"]["details"], testbed=testbed, run_lf=run_lf, - access_point_data=get_configuration["access_point"]) + access_point_data=get_configuration["access_point"], ap_version=get_ap_version) else: obj = False yield obj diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py index 85d6573e0..f878d999e 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py @@ -39,8 +39,7 @@ class TestDataplaneThroughputBRIDGE(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3913", name="WIFI-3913") @pytest.mark.wpa2_personal @pytest.mark.twog - @pytest.mark.twow - def test_tcp_upd_wpa2_personal_bridge_2g_band_ac_station(self, get_vif_state, lf_tools, + def test_tcp_udp_wpa2_personal_bridge_2g_band_ac_station(self, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): @@ -55,7 +54,7 @@ class TestDataplaneThroughputBRIDGE(object): band = "twog" vlan = 1 dut_name = create_lanforge_chamberview_dut - + influx_tags = "tcp-udp-bridge-wpa2-2.4G-ac" station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_twog, vlan_id=vlan) @@ -63,7 +62,7 @@ class TestDataplaneThroughputBRIDGE(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode, instance_name="TIP_DPT_DPT_WPA2_2G_BRIDGE", - vlan_id=vlan, dut_name=dut_name) + vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") lf_test.Client_disconnect(station_name=station_names_twog) @@ -74,7 +73,7 @@ class TestDataplaneThroughputBRIDGE(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3914", name="WIFI-3914") @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_tcp_upd_wpa2_personal_bridge_5g_band_ac_station(self, get_vif_state, lf_tools, + def test_tcp_udp_wpa2_personal_bridge_5g_band_ac_station(self, lf_tools, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput BRIDGE Mode @@ -88,7 +87,7 @@ class TestDataplaneThroughputBRIDGE(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - + influx_tags = "tcp-udp-bridge-wpa2-5G-ac" station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_fiveg, vlan_id=vlan) @@ -96,7 +95,7 @@ class TestDataplaneThroughputBRIDGE(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE", - vlan_id=vlan, dut_name=dut_name) + vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") print("Test Completed... Cleaning up Stations") @@ -107,7 +106,7 @@ class TestDataplaneThroughputBRIDGE(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_tcp_upd_wpa2_personal_bridge_5g_band_ax_station(self, get_vif_state, lf_tools, + def test_tcp_udp_wpa2_personal_bridge_5g_band_ax_station(self, lf_tools, lf_test, station_names_ax, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput BRIDGE Mode @@ -121,7 +120,7 @@ class TestDataplaneThroughputBRIDGE(object): band = "ax" vlan = 1 dut_name = create_lanforge_chamberview_dut - + influx_tags = "tcp-udp-bridge-wpa2-5G-ax" station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_ax, vlan_id=vlan) @@ -129,7 +128,7 @@ class TestDataplaneThroughputBRIDGE(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode, instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE_AX", - vlan_id=vlan, dut_name=dut_name) + vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") print("Test Completed... Cleaning up Stations") @@ -140,7 +139,7 @@ class TestDataplaneThroughputBRIDGE(object): @pytest.mark.wpa2_personal @pytest.mark.twog - def test_tcp_upd_wpa2_personal_bridge_2g_band_ax_station(self, get_vif_state, lf_tools, + def test_tcp_udp_wpa2_personal_bridge_2g_band_ax_station(self, lf_tools, lf_test, station_names_ax, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput BRIDGE Mode @@ -154,7 +153,7 @@ class TestDataplaneThroughputBRIDGE(object): band = "ax" vlan = 1 dut_name = create_lanforge_chamberview_dut - + influx_tags = "tcp-udp-bridge-wpa2-2.4G-ax" station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_ax, vlan_id=vlan) @@ -162,7 +161,7 @@ class TestDataplaneThroughputBRIDGE(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode, instance_name="TIP_DPT_DPT_WPA2_2G_BRIDGE_AX", - vlan_id=vlan, dut_name=dut_name) + vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") lf_test.Client_disconnect(station_name=station_names_ax) diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py index fd6fab573..571da97ff 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py @@ -40,7 +40,7 @@ class TestDataplaneThroughputNAT(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3913", name="WIFI-3913") @pytest.mark.wpa2_personal @pytest.mark.twog - def test_tcp_upd_wpa2_personal_nat_2g_band_ac_station(self, lf_tools, + def test_tcp_udp_wpa2_personal_nat_2g_band_ac_station(self, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput nat Mode @@ -54,6 +54,7 @@ class TestDataplaneThroughputNAT(object): band = "twog" vlan = 1 dut_name = create_lanforge_chamberview_dut + influx_tags = "tcp-udp-nat-wpa2-2.4G-ac" station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_twog, vlan_id=vlan) @@ -61,7 +62,7 @@ class TestDataplaneThroughputNAT(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode, instance_name="TIP_DPT_DPT_WPA2_2G_NAT", - vlan_id=vlan, dut_name=dut_name) + vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") lf_test.Client_disconnect(station_name=station_names_twog) @@ -72,7 +73,7 @@ class TestDataplaneThroughputNAT(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3914", name="WIFI-3914") @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_tcp_upd_wpa2_personal_nat_5g_band_ac_station(self, lf_tools, + def test_tcp_udp_wpa2_personal_nat_5g_band_ac_station(self, lf_tools, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput nat Mode pytest -m "dataplane_throughput_test and nat and wpa2_personal and fiveg" @@ -85,6 +86,7 @@ class TestDataplaneThroughputNAT(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut + influx_tags = "tcp-udp-nat-wpa2-5G-ac" station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_fiveg, vlan_id=vlan) @@ -92,7 +94,7 @@ class TestDataplaneThroughputNAT(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP_DPT_DPT_WPA2_5G_NAT", - vlan_id=vlan, dut_name=dut_name) + vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") print("Test Completed... Cleaning up Stations") @@ -103,7 +105,7 @@ class TestDataplaneThroughputNAT(object): @pytest.mark.wpa2_personal @pytest.mark.twog - def test_tcp_upd_wpa2_personal_nat_2g_band_ax_station(self, lf_tools, + def test_tcp_udp_wpa2_personal_nat_2g_band_ax_station(self, lf_tools, lf_test, station_names_ax, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput nat Mode @@ -117,6 +119,7 @@ class TestDataplaneThroughputNAT(object): band = "ax" vlan = 1 dut_name = create_lanforge_chamberview_dut + influx_tags = "tcp-udp-nat-wpa2-2.4G-ax" station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_ax, vlan_id=vlan) @@ -124,7 +127,7 @@ class TestDataplaneThroughputNAT(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode, instance_name="TIP_DPT_DPT_WPA2_2G_NAT_AX", - vlan_id=vlan, dut_name=dut_name) + vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") lf_test.Client_disconnect(station_name=station_names_ax) @@ -134,7 +137,7 @@ class TestDataplaneThroughputNAT(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_tcp_upd_wpa2_personal_nat_5g_band_aX_station(self, lf_tools, + def test_tcp_udp_wpa2_personal_nat_5g_band_aX_station(self, lf_tools, lf_test, station_names_ax, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput nat Mode @@ -148,6 +151,7 @@ class TestDataplaneThroughputNAT(object): band = "ax" vlan = 1 dut_name = create_lanforge_chamberview_dut + influx_tags = "tcp-udp-nat-wpa2-5G-ax" station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_ax, vlan_id=vlan) @@ -155,7 +159,7 @@ class TestDataplaneThroughputNAT(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode, instance_name="TIP_DPT_DPT_WPA2_5G_NAT_AX", - vlan_id=vlan, dut_name=dut_name) + vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") print("Test Completed... Cleaning up Stations") diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py index 2bd76dc29..65c78c737 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py @@ -39,7 +39,7 @@ class TestDualbandPerformanceBRIDGE(object): """ @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3918", name="WIFI-3918") @pytest.mark.wpa2_personal - @pytest.mark.twogp + @pytest.mark.twog @pytest.mark.fiveg def test_client_wpa2_personal_bridge(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): @@ -52,6 +52,7 @@ class TestDualbandPerformanceBRIDGE(object): print(lf_tools.dut_idx_mapping) dut_5g = "" dut_2g = "" + influx_tags = "bridge-wpa2" for i in lf_tools.dut_idx_mapping: if lf_tools.dut_idx_mapping[i][3] == "5G": dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] @@ -62,7 +63,7 @@ class TestDualbandPerformanceBRIDGE(object): dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, instance_name="dbp_instance_wpa2p_BRIDGE_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test Wpa2 Bridge") assert True diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py index 48dabda38..083ad7f0a 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py @@ -51,6 +51,7 @@ class TestDualbandPerformanceNat(object): print(lf_tools.dut_idx_mapping) dut_5g = "" dut_2g = "" + influx_tags = "nat-wpa2" for i in lf_tools.dut_idx_mapping: if lf_tools.dut_idx_mapping[i][3] == "5G": dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] @@ -64,7 +65,7 @@ class TestDualbandPerformanceNat(object): dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, instance_name="dbp_instance_wpa2p_nat_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test Wpa2 Nat") assert True diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py index 4c23993a7..04a9b5071 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py @@ -60,14 +60,16 @@ class TestWifiCapacityBRIDGEModeDualBand(object): mode = "BRIDGE" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["tcp", "download", "2.4G-5G Combined"] + influx_tags = "tcp-download-bridge-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="0", protocol="TCP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -90,14 +92,16 @@ class TestWifiCapacityBRIDGEModeDualBand(object): mode = "BRIDGE" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["udp", "download", "2.4G-5G Combined"] + influx_tags = "udp-download-bridge-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="0", protocol="UDP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -120,14 +124,16 @@ class TestWifiCapacityBRIDGEModeDualBand(object): mode = "BRIDGE" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["tcp", "bidirectional", "2.4G-5G Combined"] + influx_tags = "tcp-bidirectional-bridge-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -150,14 +156,16 @@ class TestWifiCapacityBRIDGEModeDualBand(object): mode = "BRIDGE" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["udp", "bidirectional", "2.4G-5G Combined"] + influx_tags = "udp-bidirectional-bridge-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -180,14 +188,16 @@ class TestWifiCapacityBRIDGEModeDualBand(object): mode = "BRIDGE" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["tcp", "download", "2.4G-5G Combined"] + influx_tags = "tcp-upload-bridge-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_ul", mode=mode, vlan_id=vlan, download_rate="0", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -210,14 +220,16 @@ class TestWifiCapacityBRIDGEModeDualBand(object): mode = "BRIDGE" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["udp", "download", "2.4G-5G Combined"] + influx_tags = "udp-upload-bridge-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_ul", mode=mode, vlan_id=vlan, download_rate="0", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_nat_mode.py index e840c81f0..3697b3f8c 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_nat_mode.py @@ -60,14 +60,16 @@ class TestWifiCapacityNATModeDualBand(object): mode = "NAT" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["tcp", "download", "2.4G-5G Combined"] + influx_tags = "tcp-download-nat-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="0", protocol="TCP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -90,14 +92,16 @@ class TestWifiCapacityNATModeDualBand(object): mode = "NAT" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["udp", "download", "2.4G-5G Combined"] + influx_tags = "udp-download-nat-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_dl", mode=mode, vlan_id=vlan, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="100Mbps", protocol="UDP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -120,14 +124,16 @@ class TestWifiCapacityNATModeDualBand(object): mode = "NAT" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["tcp", "bidirectional", "2.4G-5G Combined"] + influx_tags = "tcp-bidirectional-nat-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -150,14 +156,16 @@ class TestWifiCapacityNATModeDualBand(object): mode = "NAT" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["udp", "bidirectional", "2.4G-5G Combined"] + influx_tags = "udp-bidirectional-nat-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_bi", mode=mode, vlan_id=vlan, download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -180,14 +188,16 @@ class TestWifiCapacityNATModeDualBand(object): mode = "NAT" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["tcp", "download", "2.4G-5G Combined"] + influx_tags = "tcp-upload-nat-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_ul", mode=mode, vlan_id=vlan, download_rate="0", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -210,14 +220,16 @@ class TestWifiCapacityNATModeDualBand(object): mode = "NAT" vlan = 1 max = int(get_apnos_max_clients[0]) + sets = [["DUT_NAME", lf_tools.dut_name]] + print("sets", sets) 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.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() - influx_tags = ["udp", "download", "2.4G-5G Combined"] + influx_tags = "udp-upload-nat-wpa2-2.4G-5G" wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_ul", mode=mode, vlan_id=vlan, download_rate="0", batch_size="1,5,10,20,40,64,128,256", - influx_tags=influx_tags, + influx_tags=influx_tags, sets=sets, upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]