From 75f8dbc3816fe558799216f19d92c7de1b82de49 Mon Sep 17 00:00:00 2001 From: shivam Date: Tue, 26 Oct 2021 00:28:54 +0530 Subject: [PATCH 01/26] WIFI-5076 : Enabled the option to skip the lanforge interaction when running interop Signed-off-by: shivam --- tests/conftest.py | 40 ++++++++++++++++++++++++--------- tests/e2e/interOp/conftest.py | 42 +++++++++++++++++------------------ tests/fixtures_1x.py | 2 +- tests/fixtures_2x.py | 8 ++++--- 4 files changed, 56 insertions(+), 36 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index d678713cd..1637eabf5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -97,6 +97,13 @@ def pytest_addoption(parser): help="skip updating firmware on the AP (useful for local testing)" ) + parser.addoption( + "--skip-lanforge", + action="store_true", + default=False, + help="skip to do any interactions on lanforge (to be used in case of interop)" + ) + # change behaviour parser.addoption( "--exit-on-fail", @@ -260,6 +267,11 @@ def get_sdk_version(fixtures_ver): yield version +@pytest.fixture(scope="session") +def skip_lf(request): + yield request.config.getoption("skip-lanforge") + + # Controller Fixture @pytest.fixture(scope="session") def setup_controller(request, get_configuration, add_env_properties, fixtures_ver): @@ -542,26 +554,32 @@ def traffic_generator_connectivity(testbed, get_configuration): @pytest.fixture(scope="session") -def create_lanforge_chamberview_dut(lf_tools): - dut_object, dut_name = lf_tools.Create_Dut() +def create_lanforge_chamberview_dut(lf_tools, skip_lf): + if not skip_lf: + dut_object, dut_name = lf_tools.Create_Dut() return dut_name @pytest.fixture(scope="session") -def lf_tools(get_configuration, testbed): +def lf_tools(get_configuration, testbed, skip_lf): """ Create a DUT on LANforge""" - obj = ChamberView(lanforge_data=get_configuration["traffic_generator"]["details"], - testbed=testbed, access_point_data=get_configuration["access_point"]) - + if not skip_lf: + obj = ChamberView(lanforge_data=get_configuration["traffic_generator"]["details"], + testbed=testbed, access_point_data=get_configuration["access_point"]) + else: + obj = False yield obj @pytest.fixture(scope="session") -def lf_test(get_configuration, setup_influx, request): - if request.config.getoption("--exit-on-fail"): - obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx, debug=True) - if request.config.getoption("--exit-on-fail") is False: - obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx, debug=False) +def lf_test(get_configuration, setup_influx, request, skip_lf): + if not skip_lf: + if request.config.getoption("--exit-on-fail"): + obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx, + debug=True) + if request.config.getoption("--exit-on-fail") is False: + obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx, + debug=False) yield obj diff --git a/tests/e2e/interOp/conftest.py b/tests/e2e/interOp/conftest.py index a6170d8c3..846582b96 100644 --- a/tests/e2e/interOp/conftest.py +++ b/tests/e2e/interOp/conftest.py @@ -195,39 +195,39 @@ def setup_vlan(): @pytest.fixture(scope="class") -def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver, +def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver, skip_lf, instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools, get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info): lf_tools.reset_scenario() param = dict(request.param) - + if skip_lf: # VLAN Setup - if request.param["mode"] == "VLAN": + if request.param["mode"] == "VLAN": - vlan_list = list() - refactored_vlan_list = list() - ssid_modes = request.param["ssid_modes"].keys() - for mode in ssid_modes: - for ssid in range(len(request.param["ssid_modes"][mode])): - if "vlan" in request.param["ssid_modes"][mode][ssid]: - vlan_list.append(request.param["ssid_modes"][mode][ssid]["vlan"]) - else: - pass - if vlan_list: - [refactored_vlan_list.append(x) for x in vlan_list if x not in refactored_vlan_list] - vlan_list = refactored_vlan_list - for i in range(len(vlan_list)): - if vlan_list[i] > 4095 or vlan_list[i] < 1: - vlan_list.pop(i) - if request.param["mode"] == "VLAN": - lf_tools.add_vlan(vlan_ids=vlan_list) + vlan_list = list() + refactored_vlan_list = list() + ssid_modes = request.param["ssid_modes"].keys() + for mode in ssid_modes: + for ssid in range(len(request.param["ssid_modes"][mode])): + if "vlan" in request.param["ssid_modes"][mode][ssid]: + vlan_list.append(request.param["ssid_modes"][mode][ssid]["vlan"]) + else: + pass + if vlan_list: + [refactored_vlan_list.append(x) for x in vlan_list if x not in refactored_vlan_list] + vlan_list = refactored_vlan_list + for i in range(len(vlan_list)): + if vlan_list[i] > 4095 or vlan_list[i] < 1: + vlan_list.pop(i) + if request.param["mode"] == "VLAN": + lf_tools.add_vlan(vlan_ids=vlan_list) # call this, if 1.x return_var = fixtures_ver.setup_profiles(request, param, setup_controller, testbed, get_equipment_ref, instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools, get_security_flags, get_configuration, radius_info, get_apnos, - radius_accounting_info) + radius_accounting_info, skip_lf=skip_lf) yield return_var diff --git a/tests/fixtures_1x.py b/tests/fixtures_1x.py index 83c7754c8..8fe12c006 100644 --- a/tests/fixtures_1x.py +++ b/tests/fixtures_1x.py @@ -85,7 +85,7 @@ class Fixtures_1x: def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_ref, instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools, - get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info): + get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info, skip_lf=False): instantiate_profile = instantiate_profile(sdk_client=setup_controller) vlan_id, mode = 0, 0 diff --git a/tests/fixtures_2x.py b/tests/fixtures_2x.py index 87705022b..65320a971 100644 --- a/tests/fixtures_2x.py +++ b/tests/fixtures_2x.py @@ -324,7 +324,8 @@ class Fixtures_2x: def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_ref, instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools, - get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info): + get_security_flags, get_configuration, radius_info, get_apnos, + radius_accounting_info, skip_lf=False): instantiate_profile_obj = instantiate_profile(sdk_client=setup_controller) print(1, instantiate_profile_obj.sdk_client) @@ -660,8 +661,9 @@ class Fixtures_2x: ] ssid_data.append(ssid) lf_tools.ssid_list.append(ssid_info_sdk[interface][0]) - lf_tools.dut_idx_mapping = idx_mapping - lf_tools.update_ssid(ssid_data=ssid_data) + if skip_lf: + lf_tools.dut_idx_mapping = idx_mapping + lf_tools.update_ssid(ssid_data=ssid_data) except Exception as e: print(e) pass From 07d1e5f03576eec34287528efff1ed846b9595f9 Mon Sep 17 00:00:00 2001 From: shivam Date: Tue, 26 Oct 2021 18:10:34 +0530 Subject: [PATCH 02/26] WIFI-5076 Fixed the dut issue part Signed-off-by: shivam --- tests/conftest.py | 3 ++- tests/e2e/interOp/conftest.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 1637eabf5..31e663f25 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -269,7 +269,7 @@ def get_sdk_version(fixtures_ver): @pytest.fixture(scope="session") def skip_lf(request): - yield request.config.getoption("skip-lanforge") + yield request.config.getoption("--skip-lanforge") # Controller Fixture @@ -555,6 +555,7 @@ def traffic_generator_connectivity(testbed, get_configuration): @pytest.fixture(scope="session") def create_lanforge_chamberview_dut(lf_tools, skip_lf): + dut_name = "" if not skip_lf: dut_object, dut_name = lf_tools.Create_Dut() return dut_name diff --git a/tests/e2e/interOp/conftest.py b/tests/e2e/interOp/conftest.py index 846582b96..6e01d9b58 100644 --- a/tests/e2e/interOp/conftest.py +++ b/tests/e2e/interOp/conftest.py @@ -198,9 +198,10 @@ def setup_vlan(): def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver, skip_lf, instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools, get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info): - lf_tools.reset_scenario() + param = dict(request.param) - if skip_lf: + if not skip_lf: + lf_tools.reset_scenario() # VLAN Setup if request.param["mode"] == "VLAN": From 8c6e9542bc891d77c5faa92cc499aeeed88c4d08 Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Wed, 3 Nov 2021 23:48:44 +0530 Subject: [PATCH 03/26] WIFI-5076: interop execution without lanforge get_vif_state is made optional Signed-off-by: shivamcandela --- tests/e2e/interOp/conftest.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/e2e/interOp/conftest.py b/tests/e2e/interOp/conftest.py index 6e01d9b58..e177e342c 100644 --- a/tests/e2e/interOp/conftest.py +++ b/tests/e2e/interOp/conftest.py @@ -258,15 +258,17 @@ def failure_tracking_fixture(request): @pytest.fixture(scope="class") -def get_vif_state(get_apnos, get_configuration, request, lf_tools): - if request.config.getoption("1.x"): - ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/", sdk="1.x") - vif_state = list(ap_ssh.get_vif_state_ssids()) - vif_state.sort() - yield vif_state +def get_vif_state(get_apnos, get_configuration, request, lf_tools, skip_lf): + if not skip_lf: + if request.config.getoption("1.x"): + ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/", sdk="1.x") + vif_state = list(ap_ssh.get_vif_state_ssids()) + vif_state.sort() + yield vif_state + else: + yield lf_tools.ssid_list else: - yield lf_tools.ssid_list - + yield "" @pytest.hookimpl(tryfirst=True, hookwrapper=True) def pytest_runtest_makereport(item, call): From c4f1972badcc7df9c751f8bf0c2e0f4bbf55fbdf Mon Sep 17 00:00:00 2001 From: sushant Date: Thu, 4 Nov 2021 14:08:49 +0530 Subject: [PATCH 04/26] - changed get_vif_state_fixture to return empty list Signed-off-by: Sushant Bawiskar --- tests/e2e/interOp/conftest.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/e2e/interOp/conftest.py b/tests/e2e/interOp/conftest.py index 6e01d9b58..ce26784dd 100644 --- a/tests/e2e/interOp/conftest.py +++ b/tests/e2e/interOp/conftest.py @@ -257,15 +257,12 @@ def failure_tracking_fixture(request): yield tests_failed_during_module + +empty_get_vif_state_list = [] + @pytest.fixture(scope="class") -def get_vif_state(get_apnos, get_configuration, request, lf_tools): - if request.config.getoption("1.x"): - ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/", sdk="1.x") - vif_state = list(ap_ssh.get_vif_state_ssids()) - vif_state.sort() - yield vif_state - else: - yield lf_tools.ssid_list +def get_vif_state(): + yield empty_get_vif_state_list @pytest.hookimpl(tryfirst=True, hookwrapper=True) From e4b8d03162c97cada58575f4bb649decbb27f4b1 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Fri, 5 Nov 2021 13:28:57 +0530 Subject: [PATCH 05/26] 2.x test id - 2495 --- .../wpa2_personal/test_bridge_mode.py | 504 +++++++++--------- 1 file changed, 247 insertions(+), 257 deletions(-) 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 e85613e70..978005e12 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 @@ -15,26 +15,18 @@ import os.path import csv import pandas as pd -pytestmark = [pytest.mark.ratevsrange, pytest.mark.bridge ,pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.advance_perf, pytest.mark.ratevsrange, pytest.mark.bridge] setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, - "rf": { - "is5GHz": {"channelBandwidth": "is20MHz"}, - "is5GHzL": {"channelBandwidth": "is20MHz"}, - "is5GHzU": {"channelBandwidth": "is20MHz"} + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} + ] }, + "rf": {}, "radius": False } @@ -52,8 +44,8 @@ class TestRatevsRangeBridge(object): @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.client11b - def test_client_wpa2_personal_2g_11b(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2495", name="WIFI-2495") + def test_client_wpa2_personal_2g_11b(self, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration, lf_tools): """ @@ -68,9 +60,7 @@ class TestRatevsRangeBridge(object): band = "twog" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") + 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) @@ -82,7 +72,7 @@ class TestRatevsRangeBridge(object): if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11B", + instance_name="BRIDGE_RVR_11B_2x", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] print("report name ", report_name) @@ -113,241 +103,241 @@ class TestRatevsRangeBridge(object): else: assert False - @pytest.mark.wpa2_personal - @pytest.mark.twog - @pytest.mark.client11g - def test_client_wpa2_personal_2g_11g(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and bridge and client11g" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2496 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "BRIDGE" - band = "twog" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11G", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_twog) - script_dir = os.path.dirname(__file__) # Script directory - print(script_dir) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11a - def test_client_wpa2_personal_5g_11a(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration,lf_tools): - """ - - pytest -m "ratevsrange and bridge and client11a" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2497 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "BRIDGE" - band = "fiveg" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11A", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=['numeric-score'], dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11an - def test_client_wpa2_personal_5g_11an(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and bridge and client11an" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2498 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "BRIDGE" - band = "fiveg" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11AN", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.performance_advanced - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11ac - def test_client_wpa2_personal_5g_11ac(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and bridge and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2499 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "BRIDGE" - band = "fiveg" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] - - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11AC", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False + # @pytest.mark.wpa2_personal + # @pytest.mark.twog + # @pytest.mark.client11g + # def test_client_wpa2_personal_2g_11g(self, get_vif_state, + # lf_test, station_names_twog, create_lanforge_chamberview_dut, + # get_configuration, lf_tools): + # """ + # + # pytest -m "ratevsrange and bridge and client11g" -s -vvv --skip-testrail --testbed=advanced-02 + # jira- wifi-2496 + # """ + # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + # ssid_name = profile_data["ssid_name"] + # security_key = profile_data["security_key"] + # security = "wpa2" + # mode = "BRIDGE" + # band = "twog" + # vlan = 1 + # dut_name = create_lanforge_chamberview_dut + # 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") + # 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) + # print("station", station) + # + # val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + # if station: + # time.sleep(3) + # rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, + # instance_name="BRIDGE_RVR_11G", + # vlan_id=vlan, dut_name=dut_name, raw_lines=val) + # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # entries = os.listdir("../reports/" + report_name + '/') + # pdf = False + # for i in entries: + # if ".pdf" in i: + # pdf = i + # if pdf: + # allure.attach.file(source="../reports/" + report_name + "/" + pdf, + # name=get_configuration["access_point"][0]["model"] + "ratevsrange") + # print("Test Completed... Cleaning up Stations") + # lf_test.Client_disconnect(station_name=station_names_twog) + # script_dir = os.path.dirname(__file__) # Script directory + # print(script_dir) + # kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) + # print(str(kpi_val)) + # if str(kpi_val) == "empty": + # print("kpi is empty, station did not got ip, Test failed") + # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + # assert False + # else: + # print("Test passed successfully") + # allure.attach(name="Kpi Data", body=str(kpi_val)) + # assert station + # else: + # assert False + # + # @pytest.mark.wpa2_personal + # @pytest.mark.fiveg + # @pytest.mark.client11a + # def test_client_wpa2_personal_5g_11a(self, get_vif_state, + # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + # get_configuration,lf_tools): + # """ + # + # pytest -m "ratevsrange and bridge and client11a" -s -vvv --skip-testrail --testbed=advanced-02 + # jira- wifi-2497 + # """ + # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + # ssid_name = profile_data["ssid_name"] + # security_key = profile_data["security_key"] + # security = "wpa2" + # mode = "BRIDGE" + # band = "fiveg" + # vlan = 1 + # dut_name = create_lanforge_chamberview_dut + # 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") + # 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) + # print("station", station) + # + # val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + # if station: + # time.sleep(3) + # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + # instance_name="BRIDGE_RVR_11A", + # vlan_id=vlan, dut_name=dut_name, raw_lines=val) + # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # entries = os.listdir("../reports/" + report_name + '/') + # pdf = False + # for i in entries: + # if ".pdf" in i: + # pdf = i + # if pdf: + # allure.attach.file(source="../reports/" + report_name + "/" + pdf, + # name=get_configuration["access_point"][0]["model"] + "ratevsrange") + # print("Test Completed... Cleaning up Stations") + # lf_test.Client_disconnect(station_name=station_names_fiveg) + # kpi_val = lf_tools.read_kpi_file(column_name=['numeric-score'], dir_name=report_name) + # print(str(kpi_val)) + # if str(kpi_val) == "empty": + # print("kpi is empty, station did not got ip, Test failed") + # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + # assert False + # else: + # print("Test passed successfully") + # allure.attach(name="Kpi Data", body=str(kpi_val)) + # assert station + # else: + # assert False + # + # @pytest.mark.wpa2_personal + # @pytest.mark.fiveg + # @pytest.mark.client11an + # def test_client_wpa2_personal_5g_11an(self, get_vif_state, + # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + # get_configuration, lf_tools): + # """ + # + # pytest -m "ratevsrange and bridge and client11an" -s -vvv --skip-testrail --testbed=advanced-02 + # jira- wifi-2498 + # """ + # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + # ssid_name = profile_data["ssid_name"] + # security_key = profile_data["security_key"] + # security = "wpa2" + # mode = "BRIDGE" + # band = "fiveg" + # vlan = 1 + # dut_name = create_lanforge_chamberview_dut + # 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") + # 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) + # print("station", station) + # + # val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + # if station: + # time.sleep(3) + # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + # instance_name="BRIDGE_RVR_11AN", + # vlan_id=vlan, dut_name=dut_name, raw_lines=val) + # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # entries = os.listdir("../reports/" + report_name + '/') + # pdf = False + # for i in entries: + # if ".pdf" in i: + # pdf = i + # if pdf: + # allure.attach.file(source="../reports/" + report_name + "/" + pdf, + # name=get_configuration["access_point"][0]["model"] + "ratevsrange") + # print("Test Completed... Cleaning up Stations") + # lf_test.Client_disconnect(station_name=station_names_fiveg) + # kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) + # print(str(kpi_val)) + # if str(kpi_val) == "empty": + # print("kpi is empty, station did not got ip, Test failed") + # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + # assert False + # else: + # print("Test passed successfully") + # allure.attach(name="Kpi Data", body=str(kpi_val)) + # assert station + # else: + # assert False + # + # @pytest.mark.performance_advanced + # @pytest.mark.wpa2_personal + # @pytest.mark.fiveg + # @pytest.mark.client11ac + # def test_client_wpa2_personal_5g_11ac(self, get_vif_state, + # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + # get_configuration, lf_tools): + # """ + # + # pytest -m "ratevsrange and bridge and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 + # jira- wifi-2499 + # """ + # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + # ssid_name = profile_data["ssid_name"] + # security_key = profile_data["security_key"] + # security = "wpa2" + # mode = "BRIDGE" + # band = "fiveg" + # vlan = 1 + # dut_name = create_lanforge_chamberview_dut + # 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") + # 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) + # print("station", station) + # + # val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] + # + # if station: + # time.sleep(3) + # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + # instance_name="BRIDGE_RVR_11AC", + # vlan_id=vlan, dut_name=dut_name, raw_lines=val) + # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # entries = os.listdir("../reports/" + report_name + '/') + # pdf = False + # for i in entries: + # if ".pdf" in i: + # pdf = i + # if pdf: + # allure.attach.file(source="../reports/" + report_name + "/" + pdf, + # name=get_configuration["access_point"][0]["model"] + "ratevsrange") + # print("Test Completed... Cleaning up Stations") + # lf_test.Client_disconnect(station_name=station_names_fiveg) + # kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) + # print(str(kpi_val)) + # if str(kpi_val) == "empty": + # print("kpi is empty, station did not got ip, Test failed") + # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + # assert False + # else: + # print("Test passed successfully") + # allure.attach(name="Kpi Data", body=str(kpi_val)) + # assert station + # else: + # assert False From 7570d58bd25e1f83bb8468b9cded7adef7484476 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Fri, 5 Nov 2021 14:41:58 +0530 Subject: [PATCH 06/26] added report graphs --- .../e2e/advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py | 1 + 1 file changed, 1 insertion(+) 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 978005e12..f5b637c5b 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 @@ -78,6 +78,7 @@ class TestRatevsRangeBridge(object): print("report name ", report_name) entries = os.listdir("../reports/" + report_name + '/') print("entries",entries) + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") pdf = False for i in entries: if ".pdf" in i: From 95cf142b71c603cc549bb4e672086ddd6ace6dd2 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Fri, 5 Nov 2021 15:46:19 +0530 Subject: [PATCH 07/26] Changed instance --- .../advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f5b637c5b..11e2423a7 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 @@ -72,7 +72,7 @@ class TestRatevsRangeBridge(object): if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11B_2x", + instance_name="BRIDGE_RVR_11B_TWO_G", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] print("report name ", report_name) From 1b03a0b90187c557b9e784f1b42fe85605dee8a9 Mon Sep 17 00:00:00 2001 From: sushant Date: Fri, 5 Nov 2021 17:40:46 +0530 Subject: [PATCH 08/26] - skip lanforge added in interop.yml Signed-off-by: Sushant Bawiskar --- .github/workflows/interop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml index 564beb0f4..d47a5d050 100644 --- a/.github/workflows/interop.yml +++ b/.github/workflows/interop.yml @@ -139,7 +139,7 @@ jobs: - -c - | cd tests - pytest -m "${{ steps.marker.outputs.expression }}" -s -vvv --testbed=interop-03 -o 'jobName=Github-Interop-${{ matrix.test_type }}' -o 'jobNumber=${{ github.run_number }}' --alluredir=/tmp/allure-results + pytest -m "${{ steps.marker.outputs.expression }}" -s -vvv --testbed=interop-03 -o 'jobName=Github-Interop-${{ matrix.test_type }}' -o 'jobNumber=${{ github.run_number }}' --alluredir=/tmp/allure-results --skip-lanforge ret=\$? # sleep some time to be able to download the Allure results sleep 60 From f3ba54e77d08e4c419adc3ade894e24f3519e05e Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Fri, 5 Nov 2021 19:56:44 +0530 Subject: [PATCH 09/26] added all testcase for rvr --- .../wpa2_personal/test_bridge_mode.py | 484 +++++++++--------- 1 file changed, 246 insertions(+), 238 deletions(-) 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 11e2423a7..ef2e4c24d 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 @@ -104,241 +104,249 @@ class TestRatevsRangeBridge(object): else: assert False - # @pytest.mark.wpa2_personal - # @pytest.mark.twog - # @pytest.mark.client11g - # def test_client_wpa2_personal_2g_11g(self, get_vif_state, - # lf_test, station_names_twog, create_lanforge_chamberview_dut, - # get_configuration, lf_tools): - # """ - # - # pytest -m "ratevsrange and bridge and client11g" -s -vvv --skip-testrail --testbed=advanced-02 - # jira- wifi-2496 - # """ - # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] - # ssid_name = profile_data["ssid_name"] - # security_key = profile_data["security_key"] - # security = "wpa2" - # mode = "BRIDGE" - # band = "twog" - # vlan = 1 - # dut_name = create_lanforge_chamberview_dut - # 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") - # 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) - # print("station", station) - # - # val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - # if station: - # time.sleep(3) - # rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - # instance_name="BRIDGE_RVR_11G", - # vlan_id=vlan, dut_name=dut_name, raw_lines=val) - # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - # entries = os.listdir("../reports/" + report_name + '/') - # pdf = False - # for i in entries: - # if ".pdf" in i: - # pdf = i - # if pdf: - # allure.attach.file(source="../reports/" + report_name + "/" + pdf, - # name=get_configuration["access_point"][0]["model"] + "ratevsrange") - # print("Test Completed... Cleaning up Stations") - # lf_test.Client_disconnect(station_name=station_names_twog) - # script_dir = os.path.dirname(__file__) # Script directory - # print(script_dir) - # kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - # print(str(kpi_val)) - # if str(kpi_val) == "empty": - # print("kpi is empty, station did not got ip, Test failed") - # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - # assert False - # else: - # print("Test passed successfully") - # allure.attach(name="Kpi Data", body=str(kpi_val)) - # assert station - # else: - # assert False - # - # @pytest.mark.wpa2_personal - # @pytest.mark.fiveg - # @pytest.mark.client11a - # def test_client_wpa2_personal_5g_11a(self, get_vif_state, - # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - # get_configuration,lf_tools): - # """ - # - # pytest -m "ratevsrange and bridge and client11a" -s -vvv --skip-testrail --testbed=advanced-02 - # jira- wifi-2497 - # """ - # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - # ssid_name = profile_data["ssid_name"] - # security_key = profile_data["security_key"] - # security = "wpa2" - # mode = "BRIDGE" - # band = "fiveg" - # vlan = 1 - # dut_name = create_lanforge_chamberview_dut - # 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") - # 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) - # print("station", station) - # - # val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - # if station: - # time.sleep(3) - # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - # instance_name="BRIDGE_RVR_11A", - # vlan_id=vlan, dut_name=dut_name, raw_lines=val) - # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - # entries = os.listdir("../reports/" + report_name + '/') - # pdf = False - # for i in entries: - # if ".pdf" in i: - # pdf = i - # if pdf: - # allure.attach.file(source="../reports/" + report_name + "/" + pdf, - # name=get_configuration["access_point"][0]["model"] + "ratevsrange") - # print("Test Completed... Cleaning up Stations") - # lf_test.Client_disconnect(station_name=station_names_fiveg) - # kpi_val = lf_tools.read_kpi_file(column_name=['numeric-score'], dir_name=report_name) - # print(str(kpi_val)) - # if str(kpi_val) == "empty": - # print("kpi is empty, station did not got ip, Test failed") - # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - # assert False - # else: - # print("Test passed successfully") - # allure.attach(name="Kpi Data", body=str(kpi_val)) - # assert station - # else: - # assert False - # - # @pytest.mark.wpa2_personal - # @pytest.mark.fiveg - # @pytest.mark.client11an - # def test_client_wpa2_personal_5g_11an(self, get_vif_state, - # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - # get_configuration, lf_tools): - # """ - # - # pytest -m "ratevsrange and bridge and client11an" -s -vvv --skip-testrail --testbed=advanced-02 - # jira- wifi-2498 - # """ - # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - # ssid_name = profile_data["ssid_name"] - # security_key = profile_data["security_key"] - # security = "wpa2" - # mode = "BRIDGE" - # band = "fiveg" - # vlan = 1 - # dut_name = create_lanforge_chamberview_dut - # 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") - # 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) - # print("station", station) - # - # val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - # if station: - # time.sleep(3) - # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - # instance_name="BRIDGE_RVR_11AN", - # vlan_id=vlan, dut_name=dut_name, raw_lines=val) - # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - # entries = os.listdir("../reports/" + report_name + '/') - # pdf = False - # for i in entries: - # if ".pdf" in i: - # pdf = i - # if pdf: - # allure.attach.file(source="../reports/" + report_name + "/" + pdf, - # name=get_configuration["access_point"][0]["model"] + "ratevsrange") - # print("Test Completed... Cleaning up Stations") - # lf_test.Client_disconnect(station_name=station_names_fiveg) - # kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - # print(str(kpi_val)) - # if str(kpi_val) == "empty": - # print("kpi is empty, station did not got ip, Test failed") - # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - # assert False - # else: - # print("Test passed successfully") - # allure.attach(name="Kpi Data", body=str(kpi_val)) - # assert station - # else: - # assert False - # - # @pytest.mark.performance_advanced - # @pytest.mark.wpa2_personal - # @pytest.mark.fiveg - # @pytest.mark.client11ac - # def test_client_wpa2_personal_5g_11ac(self, get_vif_state, - # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - # get_configuration, lf_tools): - # """ - # - # pytest -m "ratevsrange and bridge and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 - # jira- wifi-2499 - # """ - # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - # ssid_name = profile_data["ssid_name"] - # security_key = profile_data["security_key"] - # security = "wpa2" - # mode = "BRIDGE" - # band = "fiveg" - # vlan = 1 - # dut_name = create_lanforge_chamberview_dut - # 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") - # 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) - # print("station", station) - # - # val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] - # - # if station: - # time.sleep(3) - # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - # instance_name="BRIDGE_RVR_11AC", - # vlan_id=vlan, dut_name=dut_name, raw_lines=val) - # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - # entries = os.listdir("../reports/" + report_name + '/') - # pdf = False - # for i in entries: - # if ".pdf" in i: - # pdf = i - # if pdf: - # allure.attach.file(source="../reports/" + report_name + "/" + pdf, - # name=get_configuration["access_point"][0]["model"] + "ratevsrange") - # print("Test Completed... Cleaning up Stations") - # lf_test.Client_disconnect(station_name=station_names_fiveg) - # kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - # print(str(kpi_val)) - # if str(kpi_val) == "empty": - # print("kpi is empty, station did not got ip, Test failed") - # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - # assert False - # else: - # print("Test passed successfully") - # allure.attach(name="Kpi Data", body=str(kpi_val)) - # assert station - # else: - # assert False + @pytest.mark.wpa2_personal + @pytest.mark.twog + @pytest.mark.client11g + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2496", name="WIFI-2496") + def test_client_wpa2_personal_2g_11g(self, get_vif_state, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration, lf_tools): + """ + + pytest -m "ratevsrange and bridge and client11g" -s -vvv --skip-testrail --testbed=advanced-02 + jira- wifi-2496 + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "twog" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + 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") + 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) + print("station", station) + + val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + if station: + time.sleep(3) + rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, + instance_name="BRIDGE_RVR_11G_TWO_G", + vlan_id=vlan, dut_name=dut_name, raw_lines=val) + report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source="../reports/" + report_name + "/" + pdf, + name=get_configuration["access_point"][0]["model"] + "ratevsrange") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_twog) + script_dir = os.path.dirname(__file__) # Script directory + print(script_dir) + kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) + print(str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) + assert station + else: + assert False + + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + @pytest.mark.client11a + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2497", name="WIFI-2497") + def test_client_wpa2_personal_5g_11a(self, get_vif_state, + lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + get_configuration,lf_tools): + """ + + pytest -m "ratevsrange and bridge and client11a" -s -vvv --skip-testrail --testbed=advanced-02 + jira- wifi-2497 + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "fiveg" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + 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") + 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) + print("station", station) + + val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + if station: + time.sleep(3) + rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + instance_name="BRIDGE_RVR_11A_FIVE_G", + vlan_id=vlan, dut_name=dut_name, raw_lines=val) + report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source="../reports/" + report_name + "/" + pdf, + name=get_configuration["access_point"][0]["model"] + "ratevsrange") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_fiveg) + kpi_val = lf_tools.read_kpi_file(column_name=['numeric-score'], dir_name=report_name) + print(str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) + assert station + else: + assert False + + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + @pytest.mark.client11an + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2498", name="WIFI-2498") + def test_client_wpa2_personal_5g_11an(self, get_vif_state, + lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + get_configuration, lf_tools): + """ + + pytest -m "ratevsrange and bridge and client11an" -s -vvv --skip-testrail --testbed=advanced-02 + jira- wifi-2498 + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "fiveg" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + 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") + 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) + print("station", station) + + val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + if station: + time.sleep(3) + rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + instance_name="BRIDGE_RVR_11AN_FIVE_G", + vlan_id=vlan, dut_name=dut_name, raw_lines=val) + report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source="../reports/" + report_name + "/" + pdf, + name=get_configuration["access_point"][0]["model"] + "ratevsrange") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_fiveg) + kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) + print(str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) + assert station + else: + assert False + + @pytest.mark.performance_advanced + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + @pytest.mark.client11ac + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2499", name="WIFI-2499") + def test_client_wpa2_personal_5g_11ac(self, get_vif_state, + lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + get_configuration, lf_tools): + """ + + pytest -m "ratevsrange and bridge and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 + jira- wifi-2499 + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "fiveg" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + 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") + 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) + print("station", station) + + val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] + + if station: + time.sleep(3) + rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + instance_name="BRIDGE_RVR_11AC_FIVE_G", + vlan_id=vlan, dut_name=dut_name, raw_lines=val) + report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source="../reports/" + report_name + "/" + pdf, + name=get_configuration["access_point"][0]["model"] + "ratevsrange") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_fiveg) + kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) + print(str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) + assert station + else: + assert False From 2259c08d9115eeae8b7e3bddb0b6d85dcaebd78b Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Fri, 5 Nov 2021 22:20:44 +0530 Subject: [PATCH 10/26] deleting vif state --- .../wpa2_personal/test_bridge_mode.py | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) 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 ef2e4c24d..502ef0be4 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 @@ -15,7 +15,7 @@ import os.path import csv import pandas as pd -pytestmark = [pytest.mark.advance_perf, pytest.mark.ratevsrange, pytest.mark.bridge] +pytestmark = [pytest.mark.advance, pytest.mark.ratevsrange, pytest.mark.bridge] setup_params_general = { @@ -108,7 +108,7 @@ class TestRatevsRangeBridge(object): @pytest.mark.twog @pytest.mark.client11g @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2496", name="WIFI-2496") - def test_client_wpa2_personal_2g_11g(self, get_vif_state, + def test_client_wpa2_personal_2g_11g(self, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration, lf_tools): """ @@ -124,9 +124,6 @@ class TestRatevsRangeBridge(object): band = "twog" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") 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) @@ -171,7 +168,7 @@ class TestRatevsRangeBridge(object): @pytest.mark.fiveg @pytest.mark.client11a @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2497", name="WIFI-2497") - def test_client_wpa2_personal_5g_11a(self, get_vif_state, + def test_client_wpa2_personal_5g_11a(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration,lf_tools): """ @@ -187,9 +184,6 @@ class TestRatevsRangeBridge(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") 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) @@ -232,7 +226,7 @@ class TestRatevsRangeBridge(object): @pytest.mark.fiveg @pytest.mark.client11an @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2498", name="WIFI-2498") - def test_client_wpa2_personal_5g_11an(self, get_vif_state, + def test_client_wpa2_personal_5g_11an(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration, lf_tools): """ @@ -248,9 +242,7 @@ class TestRatevsRangeBridge(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") + 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) @@ -294,8 +286,7 @@ class TestRatevsRangeBridge(object): @pytest.mark.fiveg @pytest.mark.client11ac @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2499", name="WIFI-2499") - def test_client_wpa2_personal_5g_11ac(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + def test_client_wpa2_personal_5g_11ac(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration, lf_tools): """ @@ -310,9 +301,7 @@ class TestRatevsRangeBridge(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") + 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) From 0d97234ce50ccef4e528c53dc97f6546cef5c986 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Sat, 6 Nov 2021 09:33:41 +0530 Subject: [PATCH 11/26] duplicating testcase in nat mode --- .../wpa2_personal/test_nat_mode.py | 147 ++++++++++-------- 1 file changed, 86 insertions(+), 61 deletions(-) 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 f7ab95d09..97ab84644 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 @@ -1,7 +1,8 @@ """ Advanced Test: Rate v/s Range test under various combinations: NAT Mode - pytest -m "throughput_benchmark_test and nat" -s -vvv --skip-testrail --testbed=basic-01 + pytest -m "ratevsrange and NAT " -s -vvv --skip-testrail --testbed=basic-01 --alluredir=../allure_reports + --> allure serve ../allure_reports/ """ @@ -10,31 +11,26 @@ import time import pytest import allure +import os.path +import csv +import pandas as pd -pytestmark = [pytest.mark.ratevsrange, pytest.mark.nat ,pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.advance, pytest.mark.ratevsrange, pytest.mark.nat] setup_params_general = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, - "rf": { - "is5GHz": {"channelBandwidth": "is20MHz"}, - "is5GHzL": {"channelBandwidth": "is20MHz"}, - "is5GHzU": {"channelBandwidth": "is20MHz"} + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} + ] }, + "rf": {}, "radius": False } -@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") +@allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -48,12 +44,12 @@ class TestRatevsRangeNat(object): @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.client11b - def test_client_wpa2_personal_2g_11b(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2495", name="WIFI-2495") + def test_client_wpa2_personal_2g_11b(self, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration, lf_tools): """ - pytest -m "ratevsrange and nat and 11bclient" -s -vvv --skip-testrail --testbed=advanced-02 + pytest -m "ratevsrange and client11b" -s -vvv --skip-testrail --testbed=advanced-02 jira- wifi-2495 """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -64,9 +60,7 @@ class TestRatevsRangeNat(object): band = "twog" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") + 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) @@ -78,10 +72,13 @@ class TestRatevsRangeNat(object): if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="NAT_RVR_11B", + instance_name="NAT_RVR_11B_TWO_G", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + print("report name ", report_name) entries = os.listdir("../reports/" + report_name + '/') + print("entries",entries) + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") pdf = False for i in entries: if ".pdf" in i: @@ -89,11 +86,20 @@ class TestRatevsRangeNat(object): if pdf: allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "ratevsrange") + + print("Test Completed... Cleaning up Stations") lf_test.Client_disconnect(station_name=station_names_twog) + kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) assert station else: assert False @@ -101,12 +107,13 @@ class TestRatevsRangeNat(object): @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.client11g - def test_client_wpa2_personal_2g_11g(self, get_vif_state, + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2496", name="WIFI-2496") + def test_client_wpa2_personal_2g_11g(self, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration, lf_tools): """ - pytest -m "ratevsrange and nat and client11g" -s -vvv --skip-testrail --testbed=advanced-02 + pytest -m "ratevsrange and NAT and client11g" -s -vvv --skip-testrail --testbed=advanced-02 jira- wifi-2496 """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -117,25 +124,22 @@ class TestRatevsRangeNat(object): band = "twog" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") 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) print("station", station) - val = [['modes: 802.11G'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="NAT_RVR_11G", + instance_name="NAT_RVR_11G_TWO_G", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") pdf = False for i in entries: if ".pdf" in i: @@ -145,9 +149,17 @@ class TestRatevsRangeNat(object): name=get_configuration["access_point"][0]["model"] + "ratevsrange") print("Test Completed... Cleaning up Stations") lf_test.Client_disconnect(station_name=station_names_twog) + script_dir = os.path.dirname(__file__) # Script directory + print(script_dir) kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) assert station else: assert False @@ -155,12 +167,13 @@ class TestRatevsRangeNat(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg @pytest.mark.client11a - def test_client_wpa2_personal_5g_11a(self, get_vif_state, + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2497", name="WIFI-2497") + def test_client_wpa2_personal_5g_11a(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration, lf_tools): + get_configuration,lf_tools): """ - pytest -m "ratevsrange and nat and client11a" -s -vvv --skip-testrail --testbed=advanced-02 + pytest -m "ratevsrange and NAT and client11a" -s -vvv --skip-testrail --testbed=advanced-02 jira- wifi-2497 """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -171,9 +184,6 @@ class TestRatevsRangeNat(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") 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) @@ -182,14 +192,14 @@ class TestRatevsRangeNat(object): val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="NAT_RVR_11A", + instance_name="NAT_RVR_11A_FIVE_G", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") pdf = False for i in entries: if ".pdf" in i: @@ -199,9 +209,15 @@ class TestRatevsRangeNat(object): name=get_configuration["access_point"][0]["model"] + "ratevsrange") print("Test Completed... Cleaning up Stations") lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) + kpi_val = lf_tools.read_kpi_file(column_name=['numeric-score'], dir_name=report_name) print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) assert station else: assert False @@ -209,12 +225,13 @@ class TestRatevsRangeNat(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg @pytest.mark.client11an - def test_client_wpa2_personal_5g_11an(self, get_vif_state, + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2498", name="WIFI-2498") + def test_client_wpa2_personal_5g_11an(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration,lf_tools): + get_configuration, lf_tools): """ - pytest -m "ratevsrange and nat and client11an" -s -vvv --skip-testrail --testbed=advanced-02 + pytest -m "ratevsrange and NAT and client11an" -s -vvv --skip-testrail --testbed=advanced-02 jira- wifi-2498 """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -225,9 +242,7 @@ class TestRatevsRangeNat(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") + 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) @@ -236,14 +251,14 @@ class TestRatevsRangeNat(object): val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="NAT_RVR_11AN", + instance_name="NAT_RVR_11AN_FIVE_G", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") pdf = False for i in entries: if ".pdf" in i: @@ -255,7 +270,13 @@ class TestRatevsRangeNat(object): lf_test.Client_disconnect(station_name=station_names_fiveg) kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) assert station else: assert False @@ -264,12 +285,12 @@ class TestRatevsRangeNat(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg @pytest.mark.client11ac - def test_client_wpa2_personal_5g_11ac(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2499", name="WIFI-2499") + def test_client_wpa2_personal_5g_11ac(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration, lf_tools): """ - pytest -m "ratevsrange and nat and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 + pytest -m "ratevsrange and NAT and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 jira- wifi-2499 """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -280,25 +301,23 @@ class TestRatevsRangeNat(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - 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") + 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) print("station", station) val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="NAT_RVR_11AC", + instance_name="NAT_RVR_11AC_FIVE_G", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") pdf = False for i in entries: if ".pdf" in i: @@ -310,7 +329,13 @@ class TestRatevsRangeNat(object): lf_test.Client_disconnect(station_name=station_names_fiveg) kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) + if str(kpi_val) == "empty": + print("kpi is empty, station did not got ip, Test failed") + allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + assert False + else: + print("Test passed successfully") + allure.attach(name="Kpi Data", body=str(kpi_val)) assert station else: assert False From ba2b393a1858d2d56db8931e1ffc67351472cfbe Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Mon, 8 Nov 2021 10:36:58 +0530 Subject: [PATCH 12/26] added more pkt size --- .../wpa2_personal/test_bridge_mode.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 502ef0be4..17b1b8cd3 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 @@ -66,13 +66,13 @@ class TestRatevsRangeBridge(object): station_name=station_names_twog, vlan_id=vlan) print("station", station) - val = [['modes: 802.11b'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11b'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11B_TWO_G", + instance_name="BRIDGE_RVR_11B_TWOG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] print("report name ", report_name) @@ -129,13 +129,13 @@ class TestRatevsRangeBridge(object): station_name=station_names_twog, vlan_id=vlan) print("station", station) - val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11g'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11G_TWO_G", + instance_name="BRIDGE_RVR_11G_TWOG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') @@ -189,13 +189,13 @@ class TestRatevsRangeBridge(object): station_name=station_names_fiveg, vlan_id=vlan) print("station", station) - val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11a'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11A_FIVE_G", + instance_name="BRIDGE_RVR_11A_FIVEG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') @@ -248,13 +248,13 @@ class TestRatevsRangeBridge(object): station_name=station_names_fiveg, vlan_id=vlan) print("station", station) - val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11an'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11AN_FIVE_G", + instance_name="BRIDGE_RVR_11AN_FIVEG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') @@ -307,13 +307,13 @@ class TestRatevsRangeBridge(object): station_name=station_names_fiveg, vlan_id=vlan) print("station", station) - val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11an-AC'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11AC_FIVE_G", + instance_name="BRIDGE_RVR_11AC_FIVEG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') From 1cf2d9b3695b4e0668dc08a16b8e65b4286aad41 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Mon, 8 Nov 2021 10:46:19 +0530 Subject: [PATCH 13/26] imports resolved --- .../advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py | 3 --- 1 file changed, 3 deletions(-) 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 17b1b8cd3..eed9ff7c2 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 @@ -8,12 +8,9 @@ """ import os import time - import pytest import allure import os.path -import csv -import pandas as pd pytestmark = [pytest.mark.advance, pytest.mark.ratevsrange, pytest.mark.bridge] From 909c74ab0ffdff94def94415f8ce8b9e6d78fe18 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Mon, 8 Nov 2021 11:03:29 +0530 Subject: [PATCH 14/26] changed pkts size in nat mode --- .../wpa2_personal/test_nat_mode.py | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) 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 97ab84644..4a320ac35 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 @@ -38,7 +38,6 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -@pytest.mark.Mhz20 class TestRatevsRangeNat(object): @pytest.mark.wpa2_personal @@ -66,13 +65,13 @@ class TestRatevsRangeNat(object): station_name=station_names_twog, vlan_id=vlan) print("station", station) - val = [['modes: 802.11b'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11b'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="NAT_RVR_11B_TWO_G", + instance_name="NAT_RVR_11B_TWOG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] print("report name ", report_name) @@ -129,13 +128,13 @@ class TestRatevsRangeNat(object): station_name=station_names_twog, vlan_id=vlan) print("station", station) - val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11g'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="NAT_RVR_11G_TWO_G", + instance_name="NAT_RVR_11G_TWOG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') @@ -189,13 +188,13 @@ class TestRatevsRangeNat(object): station_name=station_names_fiveg, vlan_id=vlan) print("station", station) - val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11a'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="NAT_RVR_11A_FIVE_G", + instance_name="NAT_RVR_11A_FIVEG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') @@ -248,13 +247,13 @@ class TestRatevsRangeNat(object): station_name=station_names_fiveg, vlan_id=vlan) print("station", station) - val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11an'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="NAT_RVR_11AN_FIVE_G", + instance_name="NAT_RVR_11AN_FIVEG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') @@ -307,13 +306,13 @@ class TestRatevsRangeNat(object): station_name=station_names_fiveg, vlan_id=vlan) print("station", station) - val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + val = [['modes: 802.11an-AC'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="NAT_RVR_11AC_FIVE_G", + instance_name="NAT_RVR_11AC_FIVEG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] entries = os.listdir("../reports/" + report_name + '/') From edc289225c73b01e59f0e58f1b5ef17cefb0b31b Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Mon, 8 Nov 2021 12:30:46 +0530 Subject: [PATCH 15/26] commenting vlan mode --- .../wpa2_personal/test_vlan_mode.py | 628 +++++++++--------- 1 file changed, 314 insertions(+), 314 deletions(-) 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 0c610435b..3313075b9 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 @@ -1,314 +1,314 @@ -""" - - Advanced Test: Rate v/s Range test under various combinations: VLAN Mode - pytest -m "throughput_benchmark_test and vlan" -s -vvv --skip-testrail --testbed=basic-01 - - -""" -import os -import time - -import pytest -import allure - -pytestmark = [pytest.mark.ratevsrange, pytest.mark.vlan ,pytest.mark.usefixtures("setup_test_run")] - - -setup_params_general = { - "mode": "VLAN", - "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}], - "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, - "rf": { - "is5GHz": {"channelBandwidth": "is20MHz"}, - "is5GHzL": {"channelBandwidth": "is20MHz"}, - "is5GHzU": {"channelBandwidth": "is20MHz"} - }, - "radius": False -} - -@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") -@pytest.mark.parametrize( - 'setup_profiles', - [setup_params_general], - indirect=True, - scope="class" -) -@pytest.mark.usefixtures("setup_profiles") -@pytest.mark.Mhz20 -class TestRatevsRangeVlan(object): - - @pytest.mark.wpa2_personal - @pytest.mark.twog - @pytest.mark.client11b - def test_client_wpa2_personal_2g_11b(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and vlan and 11bclient" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2495 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "VLAN" - band = "twog" - vlan = 100 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11b'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="VLAN_RVR_11B", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_twog) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.wpa2_personal - @pytest.mark.twog - @pytest.mark.client11g - def test_client_wpa2_personal_2g_11g(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and vlan and client11g" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2496 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "VLAN" - band = "twog" - vlan = 100 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="VLAN_RVR_11G", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_twog) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11a - def test_client_wpa2_personal_5g_11a(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and vlan and client11a" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2497 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "VLAN" - band = "fiveg" - vlan = 100 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="VLAN_RVR_11A", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11an - def test_client_wpa2_personal_5g_11an(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration,lf_tools): - """ - - pytest -m "ratevsrange and vlan and client11an" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2498 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "VLAN" - band = "fiveg" - vlan = 100 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="VLAN_RVR_11AN", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.performance_advanced - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11ac - def test_client_wpa2_personal_5g_11ac(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and vlan and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2499 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "VLAN" - band = "fiveg" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - 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") - 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) - print("station", station) - - val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="VLAN_RVR_11AC", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False +# """ +# +# Advanced Test: Rate v/s Range test under various combinations: VLAN Mode +# pytest -m "throughput_benchmark_test and vlan" -s -vvv --skip-testrail --testbed=basic-01 +# +# +# """ +# import os +# import time +# +# import pytest +# import allure +# +# pytestmark = [pytest.mark.ratevsrange, pytest.mark.vlan ,pytest.mark.usefixtures("setup_test_run")] +# +# +# setup_params_general = { +# "mode": "VLAN", +# "ssid_modes": { +# "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, +# {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], +# "security_key": "something"}], +# "wpa2_personal": [ +# {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, +# {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], +# "security_key": "something"}]}, +# "rf": { +# "is5GHz": {"channelBandwidth": "is20MHz"}, +# "is5GHzL": {"channelBandwidth": "is20MHz"}, +# "is5GHzU": {"channelBandwidth": "is20MHz"} +# }, +# "radius": False +# } +# +# @allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") +# @pytest.mark.parametrize( +# 'setup_profiles', +# [setup_params_general], +# indirect=True, +# scope="class" +# ) +# @pytest.mark.usefixtures("setup_profiles") +# @pytest.mark.Mhz20 +# class TestRatevsRangeVlan(object): +# +# @pytest.mark.wpa2_personal +# @pytest.mark.twog +# @pytest.mark.client11b +# def test_client_wpa2_personal_2g_11b(self, get_vif_state, +# lf_test, station_names_twog, create_lanforge_chamberview_dut, +# get_configuration, lf_tools): +# """ +# +# pytest -m "ratevsrange and vlan and 11bclient" -s -vvv --skip-testrail --testbed=advanced-02 +# jira- wifi-2495 +# """ +# profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] +# ssid_name = profile_data["ssid_name"] +# security_key = profile_data["security_key"] +# security = "wpa2" +# mode = "VLAN" +# band = "twog" +# vlan = 100 +# dut_name = create_lanforge_chamberview_dut +# 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") +# 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) +# print("station", station) +# +# val = [['modes: 802.11b'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], +# ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], +# ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] +# if station: +# time.sleep(3) +# rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, +# instance_name="VLAN_RVR_11B", +# vlan_id=vlan, dut_name=dut_name, raw_lines=val) +# report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] +# entries = os.listdir("../reports/" + report_name + '/') +# pdf = False +# for i in entries: +# if ".pdf" in i: +# pdf = i +# if pdf: +# allure.attach.file(source="../reports/" + report_name + "/" + pdf, +# name=get_configuration["access_point"][0]["model"] + "ratevsrange") +# print("Test Completed... Cleaning up Stations") +# lf_test.Client_disconnect(station_name=station_names_twog) +# kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) +# print(str(kpi_val)) +# allure.attach(name="Kpi Data", body=str(kpi_val)) +# assert station +# else: +# assert False +# +# @pytest.mark.wpa2_personal +# @pytest.mark.twog +# @pytest.mark.client11g +# def test_client_wpa2_personal_2g_11g(self, get_vif_state, +# lf_test, station_names_twog, create_lanforge_chamberview_dut, +# get_configuration, lf_tools): +# """ +# +# pytest -m "ratevsrange and vlan and client11g" -s -vvv --skip-testrail --testbed=advanced-02 +# jira- wifi-2496 +# """ +# profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] +# ssid_name = profile_data["ssid_name"] +# security_key = profile_data["security_key"] +# security = "wpa2" +# mode = "VLAN" +# band = "twog" +# vlan = 100 +# dut_name = create_lanforge_chamberview_dut +# 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") +# 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) +# print("station", station) +# +# val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], +# ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], +# ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] +# +# if station: +# time.sleep(3) +# rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, +# instance_name="VLAN_RVR_11G", +# vlan_id=vlan, dut_name=dut_name, raw_lines=val) +# report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] +# entries = os.listdir("../reports/" + report_name + '/') +# pdf = False +# for i in entries: +# if ".pdf" in i: +# pdf = i +# if pdf: +# allure.attach.file(source="../reports/" + report_name + "/" + pdf, +# name=get_configuration["access_point"][0]["model"] + "ratevsrange") +# print("Test Completed... Cleaning up Stations") +# lf_test.Client_disconnect(station_name=station_names_twog) +# kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) +# print(str(kpi_val)) +# allure.attach(name="Kpi Data", body=str(kpi_val)) +# assert station +# else: +# assert False +# +# @pytest.mark.wpa2_personal +# @pytest.mark.fiveg +# @pytest.mark.client11a +# def test_client_wpa2_personal_5g_11a(self, get_vif_state, +# lf_test, station_names_fiveg, create_lanforge_chamberview_dut, +# get_configuration, lf_tools): +# """ +# +# pytest -m "ratevsrange and vlan and client11a" -s -vvv --skip-testrail --testbed=advanced-02 +# jira- wifi-2497 +# """ +# profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] +# ssid_name = profile_data["ssid_name"] +# security_key = profile_data["security_key"] +# security = "wpa2" +# mode = "VLAN" +# band = "fiveg" +# vlan = 100 +# dut_name = create_lanforge_chamberview_dut +# 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") +# 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) +# print("station", station) +# +# val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], +# ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], +# ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] +# if station: +# time.sleep(3) +# rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, +# instance_name="VLAN_RVR_11A", +# vlan_id=vlan, dut_name=dut_name, raw_lines=val) +# report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] +# entries = os.listdir("../reports/" + report_name + '/') +# pdf = False +# for i in entries: +# if ".pdf" in i: +# pdf = i +# if pdf: +# allure.attach.file(source="../reports/" + report_name + "/" + pdf, +# name=get_configuration["access_point"][0]["model"] + "ratevsrange") +# print("Test Completed... Cleaning up Stations") +# lf_test.Client_disconnect(station_name=station_names_fiveg) +# kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) +# print(str(kpi_val)) +# allure.attach(name="Kpi Data", body=str(kpi_val)) +# assert station +# else: +# assert False +# +# @pytest.mark.wpa2_personal +# @pytest.mark.fiveg +# @pytest.mark.client11an +# def test_client_wpa2_personal_5g_11an(self, get_vif_state, +# lf_test, station_names_fiveg, create_lanforge_chamberview_dut, +# get_configuration,lf_tools): +# """ +# +# pytest -m "ratevsrange and vlan and client11an" -s -vvv --skip-testrail --testbed=advanced-02 +# jira- wifi-2498 +# """ +# profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] +# ssid_name = profile_data["ssid_name"] +# security_key = profile_data["security_key"] +# security = "wpa2" +# mode = "VLAN" +# band = "fiveg" +# vlan = 100 +# dut_name = create_lanforge_chamberview_dut +# 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") +# 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) +# print("station", station) +# +# val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], +# ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], +# ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] +# if station: +# time.sleep(3) +# rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, +# instance_name="VLAN_RVR_11AN", +# vlan_id=vlan, dut_name=dut_name, raw_lines=val) +# report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] +# entries = os.listdir("../reports/" + report_name + '/') +# pdf = False +# for i in entries: +# if ".pdf" in i: +# pdf = i +# if pdf: +# allure.attach.file(source="../reports/" + report_name + "/" + pdf, +# name=get_configuration["access_point"][0]["model"] + "ratevsrange") +# print("Test Completed... Cleaning up Stations") +# lf_test.Client_disconnect(station_name=station_names_fiveg) +# kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) +# print(str(kpi_val)) +# allure.attach(name="Kpi Data", body=str(kpi_val)) +# assert station +# else: +# assert False +# +# @pytest.mark.performance_advanced +# @pytest.mark.wpa2_personal +# @pytest.mark.fiveg +# @pytest.mark.client11ac +# def test_client_wpa2_personal_5g_11ac(self, get_vif_state, +# lf_test, station_names_fiveg, create_lanforge_chamberview_dut, +# get_configuration, lf_tools): +# """ +# +# pytest -m "ratevsrange and vlan and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 +# jira- wifi-2499 +# """ +# profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] +# ssid_name = profile_data["ssid_name"] +# security_key = profile_data["security_key"] +# security = "wpa2" +# mode = "VLAN" +# band = "fiveg" +# vlan = 1 +# dut_name = create_lanforge_chamberview_dut +# 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") +# 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) +# print("station", station) +# +# val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], +# ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], +# ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] +# +# if station: +# time.sleep(3) +# rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, +# instance_name="VLAN_RVR_11AC", +# vlan_id=vlan, dut_name=dut_name, raw_lines=val) +# report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] +# entries = os.listdir("../reports/" + report_name + '/') +# pdf = False +# for i in entries: +# if ".pdf" in i: +# pdf = i +# if pdf: +# allure.attach.file(source="../reports/" + report_name + "/" + pdf, +# name=get_configuration["access_point"][0]["model"] + "ratevsrange") +# print("Test Completed... Cleaning up Stations") +# lf_test.Client_disconnect(station_name=station_names_fiveg) +# kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) +# print(str(kpi_val)) +# allure.attach(name="Kpi Data", body=str(kpi_val)) +# assert station +# else: +# assert False From d61386bfb30e9801281432694498f2cecff8f38f Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Mon, 8 Nov 2021 12:31:53 +0530 Subject: [PATCH 16/26] commenting mat mode markers --- tests/e2e/advanced/rate_vs_range/wpa2_personal/test_nat_mode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4a320ac35..e350679a8 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 @@ -15,7 +15,7 @@ import os.path import csv import pandas as pd -pytestmark = [pytest.mark.advance, pytest.mark.ratevsrange, pytest.mark.nat] +# pytestmark = [pytest.mark.advance, pytest.mark.ratevsrange, pytest.mark.nat] setup_params_general = { From 955ac0eb2b61920ffb05e599817d5ec9ba08304b Mon Sep 17 00:00:00 2001 From: sushant Date: Mon, 8 Nov 2021 21:13:22 +0530 Subject: [PATCH 17/26] - changing radius server information to new radius information Signed-off-by: Sushant Bawiskar --- .github/workflows/quali.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/quali.yml b/.github/workflows/quali.yml index 1b0ab4681..b8e4af8cd 100644 --- a/.github/workflows/quali.yml +++ b/.github/workflows/quali.yml @@ -182,7 +182,7 @@ jobs: } RADIUS_SERVER_DATA = { - "ip": "10.10.10.72", + "ip": "10.10.1.221", "port": 1812, "secret": "testing123", "user": "user", @@ -191,8 +191,8 @@ jobs: } RADIUS_ACCOUNTING_DATA = { - "ip": "10.10.10.72", - "port": 1812, + "ip": "10.10.1.221", + "port": 1813, "secret": "testing123", "user": "user", "password": "password", From 7bd865a78b170447ede740fd8722416f53bc9667 Mon Sep 17 00:00:00 2001 From: KVSaiMahesh Date: Sun, 7 Nov 2021 19:34:36 +0530 Subject: [PATCH 18/26] added marker --- .../bridge_mode/test_multi_sta_thpt_2g.py | 64 ++++++++++--------- .../bridge_mode/test_mutli_sta_thpt_5g.py | 55 ++++++++-------- 2 files changed, 63 insertions(+), 56 deletions(-) diff --git a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py index 8bc972c47..864c4a637 100644 --- a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py +++ b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py @@ -69,7 +69,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_1", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -111,7 +111,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", + instance_name="multistathpt_instance_wpa2p_2g_bridge_2", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) @@ -154,7 +154,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_3", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -168,7 +168,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_2g_4(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog and fiveg" + pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -195,13 +195,14 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_4", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.twog @@ -210,7 +211,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_2g_5(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog and fiveg" + pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -237,13 +238,14 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_5", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.twog @@ -279,13 +281,14 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_6", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.twog @@ -294,7 +297,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_2g_7(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog and fiveg" + pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -321,13 +324,14 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_7", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.twog @@ -336,7 +340,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_2g_8(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog and fiveg" + pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -363,7 +367,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_8", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -404,7 +408,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_9", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -445,7 +449,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_10", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -486,7 +490,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_11", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -528,7 +532,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_12", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -542,7 +546,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_2g_13(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog and fiveg" + pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -569,7 +573,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_13", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -610,7 +614,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_14", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -651,7 +655,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_15", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -692,7 +696,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_16", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -733,7 +737,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_17", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -774,7 +778,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_18", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -788,7 +792,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_2g_19(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog and fiveg" + pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -815,7 +819,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_19", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -856,7 +860,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_20", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -897,7 +901,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_21", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -938,7 +942,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_22", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -979,7 +983,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_23", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -1021,7 +1025,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_2g_bridge_24", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] diff --git a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py index 75bec9fc2..b1d745d82 100644 --- a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py +++ b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py @@ -69,7 +69,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_1", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -112,7 +112,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", + instance_name="multistathpt_instance_wpa2p_5g_bridge_2", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) @@ -156,7 +156,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_3", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -198,13 +198,14 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_4", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.fiveg @@ -241,13 +242,14 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_5", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.fiveg @@ -284,13 +286,14 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_6", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.fiveg @@ -327,13 +330,14 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_7", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.fiveg @@ -370,7 +374,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_8", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -378,14 +382,13 @@ class TestMultiStaThptbridge(object): assert True @pytest.mark.wpa2_personal - # @pytest.mark.twog @pytest.mark.fiveg @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_dl_5g_9", url="https://telecominfraproject.atlassian.net/browse/WIFI-3782") def test_mstathpt_wpa2p_bridge_udp_dl_5g_9(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog and fiveg" + pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -413,7 +416,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_9", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -455,7 +458,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_10", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -497,7 +500,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_11", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -539,7 +542,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_12", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -581,7 +584,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_13", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -623,7 +626,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_14", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -665,7 +668,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_15", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -707,7 +710,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_16", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -749,7 +752,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_17", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -791,7 +794,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_18", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -833,7 +836,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_19", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -875,7 +878,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_20", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -917,7 +920,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_21", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -959,7 +962,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:0']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_22", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -1001,7 +1004,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:1'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_23", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] @@ -1043,7 +1046,7 @@ class TestMultiStaThptbridge(object): ['tput_multi_udp:0'], ['tput_multi_ul:1']] msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge", raw_line=raw_lines, + instance_name="multistathpt_instance_wpa2p_5g_bridge_24", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] From 5781cde2631c4524241ca0bf3f638bf8579af016 Mon Sep 17 00:00:00 2001 From: KVSaiMahesh Date: Sun, 7 Nov 2021 22:30:40 +0530 Subject: [PATCH 19/26] added influxdb in multi sta thpt fun --- libs/lanforge/lf_tests.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index a8048b494..b12016ceb 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -742,10 +742,14 @@ class RunTest: self.msthpt_obj.setup() self.msthpt_obj.run() report_name = self.msthpt_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") - influx.post_to_influx() + influx = CSVtoInflux(influx_host=self.influx_params["influx_host"], + influx_port=self.influx_params["influx_port"], + influx_org=self.influx_params["influx_org"], + influx_token=self.influx_params["influx_token"], + influx_bucket=self.influx_params["influx_bucket"], + path=report_name) + + influx.glob() return self.msthpt_obj From 33eab5f4ca2469cbba5af5027351c1c853de0c55 Mon Sep 17 00:00:00 2001 From: KVSaiMahesh Date: Sun, 7 Nov 2021 22:31:29 +0530 Subject: [PATCH 20/26] added marker --- .../bridge_mode/test_multi_sta_thpt_2g.py | 437 ++++++++---------- .../bridge_mode/test_mutli_sta_thpt_5g.py | 387 +++++++--------- 2 files changed, 380 insertions(+), 444 deletions(-) diff --git a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py index 864c4a637..2827b77ba 100644 --- a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py +++ b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py @@ -9,19 +9,21 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance,pytest.mark.Multi_Sta_Thpt,pytest.mark.wpa2_personal,pytest.mark.bridge,pytest.mark.twog] +pytestmark = [pytest.mark.performance, pytest.mark.Multi_Sta_Thpt, pytest.mark.wpa2_personal, pytest.mark.bridge, + pytest.mark.twog] setup_params_general = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}]}, "rf": {}, "radius": False } +@allure.suite("performance") +@allure.feature("BRIDGE MODE WPA2 PERSONAL Multi_Station_Throughput") @pytest.mark.Multi_Sta_Thpt @pytest.mark.wifi5 @pytest.mark.wifi6 @@ -39,14 +41,14 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_dl_2g_1", url="https://telecominfraproject.atlassian.net/browse/WIFI-3631") def test_mstathpt_wpa2p_bridge_udp_dl_2g_1(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -54,23 +56,20 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_1", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -81,13 +80,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_dl_2g_2", url="https://telecominfraproject.atlassian.net/browse/WIFI-3633") def test_mstathpt_wpa2p_bridge_tcp_dl_2g_2(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -95,25 +94,23 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_2", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, @@ -125,13 +122,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_ul_2g_3", url="https://telecominfraproject.atlassian.net/browse/WIFI-3635") def test_mstathpt_wpa2p_bridge_udp_ul_2g_3(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -139,23 +136,21 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_3", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -166,13 +161,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_ul_2g_4", url="https://telecominfraproject.atlassian.net/browse/WIFI-3637") def test_mstathpt_wpa2p_bridge_tcp_ul_2g_4(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -180,23 +175,21 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_4", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -209,13 +202,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_dl_2g_5", url="https://telecominfraproject.atlassian.net/browse/WIFI-3639") def test_mstathpt_wpa2p_bridge_udp_dl_2g_5(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -223,23 +216,21 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_5", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -252,13 +243,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_dl_2g_6", url="https://telecominfraproject.atlassian.net/browse/WIFI-3641") def test_mstathpt_wpa2p_bridge_tcp_dl_2g_6(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -266,23 +257,21 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_6", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -295,13 +284,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_ul_2g_7", url="https://telecominfraproject.atlassian.net/browse/WIFI-3643") def test_mstathpt_wpa2p_bridge_udp_ul_2g_7(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -309,23 +298,21 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_7", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -338,13 +325,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_ul_2g_8", url="https://telecominfraproject.atlassian.net/browse/WIFI-3645") def test_mstathpt_wpa2p_bridge_tcp_ul_2g_8(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -352,23 +339,21 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_8", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -379,13 +364,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_dl_2g_9", url="https://telecominfraproject.atlassian.net/browse/WIFI-3781") def test_mstathpt_wpa2p_bridge_udp_dl_2g_9(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -393,23 +378,21 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200,512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_9", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -420,13 +403,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_dl_2g_10", url="https://telecominfraproject.atlassian.net/browse/WIFI-3783") def test_mstathpt_wpa2p_bridge_tcp_dl_2g_10(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -434,23 +417,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_10", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_10", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -461,13 +443,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_ul_2g_11", url="https://telecominfraproject.atlassian.net/browse/WIFI-3786") def test_mstathpt_wpa2p_bridge_udp_ul_2g_11(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -475,23 +457,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_11", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_11", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -502,14 +483,14 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_ul_2g_12", url="https://telecominfraproject.atlassian.net/browse/WIFI-3788") def test_mstathpt_wpa2p_bridge_tcp_ul_2g_12(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -517,23 +498,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_12", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_12", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -544,13 +524,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_dl_2g_13", url="https://telecominfraproject.atlassian.net/browse/WIFI-3790") def test_mstathpt_wpa2p_bridge_udp_dl_2g_13(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -558,23 +538,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_13", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_13", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -585,13 +564,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_dl_2g_14", url="https://telecominfraproject.atlassian.net/browse/WIFI-3793") def test_mstathpt_wpa2p_bridge_tcp_dl_2g_14(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -599,23 +578,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_14", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_14", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -626,13 +604,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_ul_2g_15", url="https://telecominfraproject.atlassian.net/browse/WIFI-3798") def test_mstathpt_wpa2p_bridge_udp_ul_2g_15(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -640,23 +618,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_15", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_15", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -667,13 +644,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_ul_2g_16", url="https://telecominfraproject.atlassian.net/browse/WIFI-3800") def test_mstathpt_wpa2p_bridge_tcp_ul_2g_16(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -681,23 +658,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_16", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_16", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -708,13 +684,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_dl_2g_17", url="https://telecominfraproject.atlassian.net/browse/WIFI-3802") def test_mstathpt_wpa2p_bridge_udp_dl_2g_17(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -722,23 +698,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_17", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_17", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -749,13 +724,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_dl_2g_18", url="https://telecominfraproject.atlassian.net/browse/WIFI-3804") def test_mstathpt_wpa2p_bridge_tcp_dl_2g_18(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -763,23 +738,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_18", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_18", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -790,13 +764,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_ul_2g_19", url="https://telecominfraproject.atlassian.net/browse/WIFI-3806") def test_mstathpt_wpa2p_bridge_udp_ul_2g_19(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -804,23 +778,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_19", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_19", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -831,13 +804,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_ul_2g_20", url="https://telecominfraproject.atlassian.net/browse/WIFI-3810") def test_mstathpt_wpa2p_bridge_tcp_ul_2g_20(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -845,23 +818,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_20", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_20", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -872,13 +844,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_dl_2g_21", url="https://telecominfraproject.atlassian.net/browse/WIFI-3812") def test_mstathpt_wpa2p_bridge_udp_dl_2g_21(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -886,23 +858,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_21", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_21", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -913,13 +884,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_dl_2g_22", url="https://telecominfraproject.atlassian.net/browse/WIFI-3815") def test_mstathpt_wpa2p_bridge_tcp_dl_2g_22(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -927,23 +898,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_22", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_22", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -954,13 +924,13 @@ class TestMultiStaThptbridge(object): @allure.testcase(name="test_mstathpt_wpa2p_bridge_udp_ul_2g_23", url="https://telecominfraproject.atlassian.net/browse/WIFI-3817") def test_mstathpt_wpa2p_bridge_udp_ul_2g_23(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -968,41 +938,39 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_23", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_23", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") assert True - @pytest.mark.wpa2_personal @pytest.mark.twog @allure.testcase(name="test_mstathpt_wpa2p_bridge_tcp_ul_2g_24", url="https://telecominfraproject.atlassian.net/browse/WIFI-3819") def test_mstathpt_wpa2p_bridge_tcp_ul_2g_24(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + create_lanforge_chamberview_dut, lf_test, get_configuration): """ pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -1010,23 +978,22 @@ class TestMultiStaThptbridge(object): dut_5g = "" dut_2g = "" 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] - print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + if ssid_2G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") raw_lines = [['skip_5:1'], ['skip_dual:1'], ['hunt_retries:1'], ['hunt_iter:10'], ['pkt_loss_thresh:500000'], ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_2g_bridge_24", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + instance_name="multistathpt_instance_wpa2p_2g_bridge_24", + raw_line=raw_lines, + vlan_id=vlan, dut_5g="", dut_2g=dut_2g) report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") diff --git a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py index b1d745d82..f1adeea14 100644 --- a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py +++ b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py @@ -9,19 +9,21 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance,pytest.mark.Multi_Sta_Thpt,pytest.mark.wpa2_personal, pytest.mark.bridge, pytest.mark.fiveg] +pytestmark = [pytest.mark.performance, pytest.mark.Multi_Sta_Thpt, pytest.mark.wpa2_personal, pytest.mark.bridge, + pytest.mark.fiveg] setup_params_general = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False } +@allure.suite("performance") +@allure.feature("BRIDGE MODE WPA2 PERSONAL Multi_Station_Throughput") @pytest.mark.Multi_Sta_Thpt @pytest.mark.wifi5 @pytest.mark.wifi6 @@ -45,8 +47,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -57,10 +59,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -68,9 +68,9 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_1", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -87,8 +87,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -99,10 +99,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -111,10 +109,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_2", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, @@ -132,8 +130,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -144,10 +142,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -155,9 +151,9 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_3", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -174,8 +170,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -186,10 +182,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -197,9 +191,9 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_4", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -218,8 +212,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -230,10 +224,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -241,9 +233,9 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_5", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -262,8 +254,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -274,10 +266,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -285,9 +275,9 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_6", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -306,8 +296,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -318,10 +308,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -329,9 +317,9 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_7", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -350,8 +338,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -362,10 +350,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -373,9 +359,9 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_8", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -392,8 +378,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -404,10 +390,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -415,9 +399,9 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_9", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -434,8 +418,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -446,10 +430,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -457,9 +439,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_10", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_10", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -476,8 +459,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -488,10 +471,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -499,9 +480,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_11", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_11", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -518,8 +500,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -530,10 +512,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -541,9 +521,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_12", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_12", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -560,8 +541,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -572,10 +553,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -583,9 +562,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_13", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_13", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -602,8 +582,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -614,10 +594,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -625,9 +603,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_14", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_14", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -644,8 +623,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -656,10 +635,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -667,9 +644,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_15", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_15", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -686,8 +664,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -698,10 +676,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -709,9 +685,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_16", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_16", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -728,8 +705,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -740,10 +717,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -751,9 +726,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_17", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_17", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -770,8 +746,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -782,10 +758,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -793,9 +767,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_18", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_18", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -812,8 +787,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -824,10 +799,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -835,9 +808,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_19", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_19", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -854,8 +828,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -866,10 +840,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -877,9 +849,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_20", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_20", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -896,8 +869,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -908,10 +881,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -919,9 +890,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_21", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_21", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -938,8 +910,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -950,10 +922,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -961,9 +931,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_22", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_22", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -980,8 +951,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -992,10 +963,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -1003,9 +972,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_23", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_23", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") @@ -1022,8 +992,8 @@ class TestMultiStaThptbridge(object): """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -1034,10 +1004,8 @@ class TestMultiStaThptbridge(object): 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] print(dut_5g) - if lf_tools.dut_idx_mapping[i][3] == "2G": - dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - print(dut_2g) - if ssid_2G and ssid_5G not in get_vif_state: + + if ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") @@ -1045,9 +1013,10 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="multistathpt_instance_wpa2p_5g_bridge_24", raw_line=raw_lines, - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + instance_name="multistathpt_instance_wpa2p_5g_bridge_24", + raw_line=raw_lines, + vlan_id=vlan, dut_5g=dut_5g, dut_2g="") report_name = msthpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Multi Station Throughput vs Packet Size Test") From ea47ae0f140a136c60eeed6c74a706196c8e23b2 Mon Sep 17 00:00:00 2001 From: KVSaiMahesh Date: Mon, 8 Nov 2021 21:40:12 +0530 Subject: [PATCH 21/26] changed multi sta fun name to lower case --- libs/lanforge/lf_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index b12016ceb..dbdddf0aa 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -684,7 +684,7 @@ class RunTest: else: return False - def Multi_Sta_Thpt(self, ssid_5G="[BLANK]", ssid_2G="[BLANK]", mode="BRIDGE", vlan_id=100, dut_name="TIP", + def multi_sta_thpt(self, ssid_5G="[BLANK]", ssid_2G="[BLANK]", mode="BRIDGE", vlan_id=100, dut_name="TIP", raw_line=[], instance_name="test_demo", dut_5g="", dut_2g=""): inst_name = instance_name.split('_')[0] From 836ab658645443229b086b1ed8d6070a0147078d Mon Sep 17 00:00:00 2001 From: KVSaiMahesh Date: Mon, 8 Nov 2021 21:42:11 +0530 Subject: [PATCH 22/26] removed unnecessary marker --- .../bridge_mode/test_multi_sta_thpt_2g.py | 103 +++++++++--------- .../bridge_mode/test_mutli_sta_thpt_5g.py | 103 +++++++++--------- 2 files changed, 100 insertions(+), 106 deletions(-) diff --git a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py index 2827b77ba..db429e221 100644 --- a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py +++ b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_multi_sta_thpt_2g.py @@ -1,7 +1,7 @@ """ Multi Station throughput vs Packet Size test: Bridge Mode - pytest -m "Multi_Sta_Thpt and wpa2_personal and bridge and twog" + pytest -m "multi_sta_thpt and wpa2_personal and bridge and twog" """ @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.Multi_Sta_Thpt, pytest.mark.wpa2_personal, pytest.mark.bridge, +pytestmark = [pytest.mark.performance, pytest.mark.multi_sta_thpt, pytest.mark.wpa2_personal, pytest.mark.bridge, pytest.mark.twog] setup_params_general = { @@ -24,9 +24,6 @@ setup_params_general = { @allure.suite("performance") @allure.feature("BRIDGE MODE WPA2 PERSONAL Multi_Station_Throughput") -@pytest.mark.Multi_Sta_Thpt -@pytest.mark.wifi5 -@pytest.mark.wifi6 @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -43,7 +40,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_2g_1(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -67,7 +64,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_1", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -82,7 +79,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_2g_2(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -107,7 +104,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_2", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -124,7 +121,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_2g_3(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -148,7 +145,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_3", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -163,7 +160,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_2g_4(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -187,7 +184,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_4", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -204,7 +201,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_2g_5(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -228,7 +225,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_5", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -245,7 +242,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_2g_6(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -269,7 +266,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_6", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -286,7 +283,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_2g_7(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -310,7 +307,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_7", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -327,7 +324,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_2g_8(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -351,7 +348,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_8", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -366,7 +363,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_2g_9(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -390,7 +387,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_9", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -405,7 +402,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_2g_10(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -429,7 +426,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_10", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -445,7 +442,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_2g_11(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -469,7 +466,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_11", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -485,7 +482,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_2g_12(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -510,7 +507,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_12", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -526,7 +523,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_2g_13(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -550,7 +547,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_13", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -566,7 +563,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_2g_14(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -590,7 +587,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_14", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -606,7 +603,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_2g_15(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -630,7 +627,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_15", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -646,7 +643,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_2g_16(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -670,7 +667,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_16", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -686,7 +683,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_2g_17(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -710,7 +707,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_17", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -726,7 +723,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_2g_18(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -750,7 +747,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_18", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -766,7 +763,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_2g_19(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -790,7 +787,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_19", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -806,7 +803,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_2g_20(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -830,7 +827,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_20", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -846,7 +843,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_2g_21(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -870,7 +867,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_21", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -886,7 +883,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_2g_22(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -910,7 +907,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_22", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -926,7 +923,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_2g_23(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -950,7 +947,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_23", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) @@ -966,7 +963,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_2g_24(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and twog" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] @@ -990,7 +987,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G=ssid_2G, ssid_5G="", instance_name="multistathpt_instance_wpa2p_2g_bridge_24", raw_line=raw_lines, vlan_id=vlan, dut_5g="", dut_2g=dut_2g) diff --git a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py index f1adeea14..84c520bb4 100644 --- a/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py +++ b/tests/e2e/basic/performance_tests/multi_station_throughput/wpa2_personal/bridge_mode/test_mutli_sta_thpt_5g.py @@ -1,7 +1,7 @@ """ Multi Station throughput vs Packet Size test: Bridge Mode - pytest -m "Multi_Sta_Thpt and wpa2_personal and bridge and fiveg" + pytest -m "multi_sta_thpt and wpa2_personal and bridge and fiveg" """ @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.Multi_Sta_Thpt, pytest.mark.wpa2_personal, pytest.mark.bridge, +pytestmark = [pytest.mark.performance, pytest.mark.multi_sta_thpt, pytest.mark.wpa2_personal, pytest.mark.bridge, pytest.mark.fiveg] setup_params_general = { @@ -24,9 +24,6 @@ setup_params_general = { @allure.suite("performance") @allure.feature("BRIDGE MODE WPA2 PERSONAL Multi_Station_Throughput") -@pytest.mark.Multi_Sta_Thpt -@pytest.mark.wifi5 -@pytest.mark.wifi6 @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -43,7 +40,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_5g_1(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -68,7 +65,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_1", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -83,7 +80,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_5g_2(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -109,7 +106,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_2", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -126,7 +123,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_5g_3(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -151,7 +148,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_3", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -166,7 +163,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_5g_4(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -191,7 +188,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_4", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -208,7 +205,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_5g_5(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -233,7 +230,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_5", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -250,7 +247,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_5g_6(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -275,7 +272,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_6", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -292,7 +289,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_5g_7(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -317,7 +314,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_7", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -334,7 +331,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_5g_8(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -359,7 +356,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512,1024,MTU'], ['capacities:MAX'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_8", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -374,7 +371,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_5g_9(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -399,7 +396,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200,512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_9", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -414,7 +411,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_5g_10(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -439,7 +436,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_10", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -455,7 +452,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_5g_11(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -480,7 +477,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_11", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -496,7 +493,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_5g_12(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -521,7 +518,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:200'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_12", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -537,7 +534,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_5g_13(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -562,7 +559,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_13", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -578,7 +575,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_5g_14(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -603,7 +600,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_14", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -619,7 +616,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_5g_15(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -644,7 +641,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_15", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -660,7 +657,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_5g_16(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -685,7 +682,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:512'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_16", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -701,7 +698,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_5g_17(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -726,7 +723,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_17", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -742,7 +739,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_5g_18(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -767,7 +764,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_18", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -783,7 +780,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_5g_19(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -808,7 +805,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_19", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -824,7 +821,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_5g_20(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -849,7 +846,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:1024'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_20", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -865,7 +862,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_dl_5g_21(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -890,7 +887,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:1'], ['tput_multi_udp:1'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_21", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -906,7 +903,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_dl_5g_22(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -931,7 +928,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:1'], ['tput_multi_udp:0'], ['tput_multi_ul:0']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_22", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -947,7 +944,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_udp_ul_5g_23(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -972,7 +969,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:0'], ['tput_multi_dl:0'], ['tput_multi_udp:1'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_23", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") @@ -988,7 +985,7 @@ class TestMultiStaThptbridge(object): def test_mstathpt_wpa2p_bridge_tcp_ul_5g_24(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration): """ - pytest -m "Multi_Sta_Thpt and bridge and wpa2_personal and fiveg" + pytest -m "multi_sta_thpt and bridge and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] @@ -1013,7 +1010,7 @@ class TestMultiStaThptbridge(object): ['frame_sizes:MTU'], ['capacities:1,2,5'], ['tput_multi_tcp:1'], ['tput_multi_dl:0'], ['tput_multi_udp:0'], ['tput_multi_ul:1']] - msthpt_obj = lf_test.Multi_Sta_Thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, + msthpt_obj = lf_test.multi_sta_thpt(mode=mode, ssid_2G="", ssid_5G=ssid_5G, instance_name="multistathpt_instance_wpa2p_5g_bridge_24", raw_line=raw_lines, vlan_id=vlan, dut_5g=dut_5g, dut_2g="") From 5ca8f6b414772e46bbb8d527fb3c1bb3f989a419 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Tue, 9 Nov 2021 13:07:24 +0530 Subject: [PATCH 23/26] commenting all testcases --- .../wpa2_personal/test_bridge_mode.py | 453 ++++++++---------- 1 file changed, 207 insertions(+), 246 deletions(-) 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 eed9ff7c2..6b6514c26 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 @@ -69,7 +69,7 @@ class TestRatevsRangeBridge(object): if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11B_TWOG", + instance_name="BRIDGE_RVR_11B_TWOG_bridge", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] print("report name ", report_name) @@ -87,252 +87,213 @@ class TestRatevsRangeBridge(object): print("Test Completed... Cleaning up Stations") lf_test.Client_disconnect(station_name=station_names_twog) - - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) + # kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) + # print(str(kpi_val)) + # if str(kpi_val) == "empty": + # print("kpi is empty, station did not got ip, Test failed") + # allure.attach(name="Kpi Data", body="station did not got ip Test failed.") + # assert False + # else: + # print("Test passed successfully") + # allure.attach(name="Kpi Data", body=str(kpi_val)) assert station else: assert False - @pytest.mark.wpa2_personal - @pytest.mark.twog - @pytest.mark.client11g - @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2496", name="WIFI-2496") - def test_client_wpa2_personal_2g_11g(self, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and bridge and client11g" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2496 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "BRIDGE" - band = "twog" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - 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) - print("station", station) - - val = [['modes: 802.11g'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11G_TWOG", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_twog) - script_dir = os.path.dirname(__file__) # Script directory - print(script_dir) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11a - @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2497", name="WIFI-2497") - def test_client_wpa2_personal_5g_11a(self, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration,lf_tools): - """ - - pytest -m "ratevsrange and bridge and client11a" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2497 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "BRIDGE" - band = "fiveg" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - 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) - print("station", station) - - val = [['modes: 802.11a'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11A_FIVEG", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=['numeric-score'], dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11an - @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2498", name="WIFI-2498") - def test_client_wpa2_personal_5g_11an(self, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and bridge and client11an" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2498 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "BRIDGE" - band = "fiveg" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - - 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) - print("station", station) - - val = [['modes: 802.11an'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11AN_FIVEG", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False - - @pytest.mark.performance_advanced - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - @pytest.mark.client11ac - @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2499", name="WIFI-2499") - def test_client_wpa2_personal_5g_11ac(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration, lf_tools): - """ - - pytest -m "ratevsrange and bridge and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 - jira- wifi-2499 - """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssid_name = profile_data["ssid_name"] - security_key = profile_data["security_key"] - security = "wpa2" - mode = "BRIDGE" - band = "fiveg" - vlan = 1 - dut_name = create_lanforge_chamberview_dut - - 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) - print("station", station) - - val = [['modes: 802.11an-AC'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], - ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] - - if station: - time.sleep(3) - rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - instance_name="BRIDGE_RVR_11AC_FIVEG", - vlan_id=vlan, dut_name=dut_name, raw_lines=val) - report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "ratevsrange") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - kpi_val = lf_tools.read_kpi_file(column_name=None, dir_name=report_name) - print(str(kpi_val)) - if str(kpi_val) == "empty": - print("kpi is empty, station did not got ip, Test failed") - allure.attach(name="Kpi Data", body="station did not got ip Test failed.") - assert False - else: - print("Test passed successfully") - allure.attach(name="Kpi Data", body=str(kpi_val)) - assert station - else: - assert False + # @pytest.mark.wpa2_personal + # @pytest.mark.twog + # @pytest.mark.client11g + # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2496", name="WIFI-2496") + # def test_client_wpa2_personal_2g_11g(self, + # lf_test, station_names_twog, create_lanforge_chamberview_dut, + # get_configuration, lf_tools): + # """ + # + # pytest -m "ratevsrange and bridge and client11g" -s -vvv --skip-testrail --testbed=advanced-02 + # jira- wifi-2496 + # """ + # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + # ssid_name = profile_data["ssid_name"] + # security_key = profile_data["security_key"] + # security = "wpa2" + # mode = "BRIDGE" + # band = "twog" + # vlan = 1 + # dut_name = create_lanforge_chamberview_dut + # 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) + # print("station", station) + # + # val = [['modes: 802.11g'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + # if station: + # time.sleep(3) + # rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, + # instance_name="BRIDGE_RVR_11G_TWOG", + # vlan_id=vlan, dut_name=dut_name, raw_lines=val) + # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # entries = os.listdir("../reports/" + report_name + '/') + # lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + # pdf = False + # for i in entries: + # if ".pdf" in i: + # pdf = i + # if pdf: + # allure.attach.file(source="../reports/" + report_name + "/" + pdf, + # name=get_configuration["access_point"][0]["model"] + "ratevsrange") + # print("Test Completed... Cleaning up Stations") + # lf_test.Client_disconnect(station_name=station_names_twog) + # assert station + # else: + # assert False + # + # @pytest.mark.wpa2_personal + # @pytest.mark.fiveg + # @pytest.mark.client11a + # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2497", name="WIFI-2497") + # def test_client_wpa2_personal_5g_11a(self, + # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + # get_configuration,lf_tools): + # """ + # + # pytest -m "ratevsrange and bridge and client11a" -s -vvv --skip-testrail --testbed=advanced-02 + # jira- wifi-2497 + # """ + # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + # ssid_name = profile_data["ssid_name"] + # security_key = profile_data["security_key"] + # security = "wpa2" + # mode = "BRIDGE" + # band = "fiveg" + # vlan = 1 + # dut_name = create_lanforge_chamberview_dut + # 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) + # print("station", station) + # + # val = [['modes: 802.11a'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + # if station: + # time.sleep(3) + # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + # instance_name="BRIDGE_RVR_11A_FIVEG", + # vlan_id=vlan, dut_name=dut_name, raw_lines=val) + # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # entries = os.listdir("../reports/" + report_name + '/') + # lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + # pdf = False + # for i in entries: + # if ".pdf" in i: + # pdf = i + # if pdf: + # allure.attach.file(source="../reports/" + report_name + "/" + pdf, + # name=get_configuration["access_point"][0]["model"] + "ratevsrange") + # print("Test Completed... Cleaning up Stations") + # lf_test.Client_disconnect(station_name=station_names_fiveg) + # assert station + # else: + # assert False + # + # @pytest.mark.wpa2_personal + # @pytest.mark.fiveg + # @pytest.mark.client11an + # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2498", name="WIFI-2498") + # def test_client_wpa2_personal_5g_11an(self, + # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + # get_configuration, lf_tools): + # """ + # + # pytest -m "ratevsrange and bridge and client11an" -s -vvv --skip-testrail --testbed=advanced-02 + # jira- wifi-2498 + # """ + # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + # ssid_name = profile_data["ssid_name"] + # security_key = profile_data["security_key"] + # security = "wpa2" + # mode = "BRIDGE" + # band = "fiveg" + # vlan = 1 + # dut_name = create_lanforge_chamberview_dut + # + # 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) + # print("station", station) + # + # val = [['modes: 802.11an'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + # if station: + # time.sleep(3) + # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + # instance_name="BRIDGE_RVR_11AN_FIVEG", + # vlan_id=vlan, dut_name=dut_name, raw_lines=val) + # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # entries = os.listdir("../reports/" + report_name + '/') + # lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + # pdf = False + # for i in entries: + # if ".pdf" in i: + # pdf = i + # if pdf: + # allure.attach.file(source="../reports/" + report_name + "/" + pdf, + # name=get_configuration["access_point"][0]["model"] + "ratevsrange") + # print("Test Completed... Cleaning up Stations") + # lf_test.Client_disconnect(station_name=station_names_fiveg) + # assert station + # else: + # assert False + # + # @pytest.mark.performance_advanced + # @pytest.mark.wpa2_personal + # @pytest.mark.fiveg + # @pytest.mark.client11ac + # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2499", name="WIFI-2499") + # def test_client_wpa2_personal_5g_11ac(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + # get_configuration, lf_tools): + # """ + # + # pytest -m "ratevsrange and bridge and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 + # jira- wifi-2499 + # """ + # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + # ssid_name = profile_data["ssid_name"] + # security_key = profile_data["security_key"] + # security = "wpa2" + # mode = "BRIDGE" + # band = "fiveg" + # vlan = 1 + # dut_name = create_lanforge_chamberview_dut + # + # 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) + # print("station", station) + # + # val = [['modes: 802.11an-AC'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] + # + # if station: + # time.sleep(3) + # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + # instance_name="BRIDGE_RVR_11AC_FIVEG", + # vlan_id=vlan, dut_name=dut_name, raw_lines=val) + # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # entries = os.listdir("../reports/" + report_name + '/') + # lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + # pdf = False + # for i in entries: + # if ".pdf" in i: + # pdf = i + # if pdf: + # allure.attach.file(source="../reports/" + report_name + "/" + pdf, + # name=get_configuration["access_point"][0]["model"] + "ratevsrange") + # print("Test Completed... Cleaning up Stations") + # lf_test.Client_disconnect(station_name=station_names_fiveg) + # assert station + # else: + # assert False From 371165876a2e18c1e1043bd275bdf2d6be9bd9fa Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Tue, 9 Nov 2021 14:53:13 +0530 Subject: [PATCH 24/26] testcases back to mtu --- .../advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6b6514c26..e3462ca80 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 @@ -63,7 +63,7 @@ class TestRatevsRangeBridge(object): station_name=station_names_twog, vlan_id=vlan) print("station", station) - val = [['modes: 802.11b'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + val = [['modes: 802.11b'], ['pkts: MTU'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] if station: From f4cb3079bc51138bf980253c0067800b679d4758 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Tue, 9 Nov 2021 15:05:19 +0530 Subject: [PATCH 25/26] testcases back to mtu --- .../advanced/rate_vs_range/wpa2_personal/test_bridge_mode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e3462ca80..289846bb0 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 @@ -69,7 +69,7 @@ class TestRatevsRangeBridge(object): if station: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11B_TWOG_bridge", + instance_name="MODEBRIDGE_RVR_11B_TWOG", vlan_id=vlan, dut_name=dut_name, raw_lines=val) report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] print("report name ", report_name) From 96b4a097530f31895c848de6d1a99a6b5e01c579 Mon Sep 17 00:00:00 2001 From: Nikita Yadav Date: Tue, 9 Nov 2021 15:36:43 +0530 Subject: [PATCH 26/26] final push --- .../wpa2_personal/test_bridge_mode.py | 394 +++++++++--------- 1 file changed, 197 insertions(+), 197 deletions(-) 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 289846bb0..f477fa17a 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 @@ -100,200 +100,200 @@ class TestRatevsRangeBridge(object): else: assert False - # @pytest.mark.wpa2_personal - # @pytest.mark.twog - # @pytest.mark.client11g - # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2496", name="WIFI-2496") - # def test_client_wpa2_personal_2g_11g(self, - # lf_test, station_names_twog, create_lanforge_chamberview_dut, - # get_configuration, lf_tools): - # """ - # - # pytest -m "ratevsrange and bridge and client11g" -s -vvv --skip-testrail --testbed=advanced-02 - # jira- wifi-2496 - # """ - # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] - # ssid_name = profile_data["ssid_name"] - # security_key = profile_data["security_key"] - # security = "wpa2" - # mode = "BRIDGE" - # band = "twog" - # vlan = 1 - # dut_name = create_lanforge_chamberview_dut - # 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) - # print("station", station) - # - # val = [['modes: 802.11g'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], - # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - # if station: - # time.sleep(3) - # rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - # instance_name="BRIDGE_RVR_11G_TWOG", - # vlan_id=vlan, dut_name=dut_name, raw_lines=val) - # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - # entries = os.listdir("../reports/" + report_name + '/') - # lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") - # pdf = False - # for i in entries: - # if ".pdf" in i: - # pdf = i - # if pdf: - # allure.attach.file(source="../reports/" + report_name + "/" + pdf, - # name=get_configuration["access_point"][0]["model"] + "ratevsrange") - # print("Test Completed... Cleaning up Stations") - # lf_test.Client_disconnect(station_name=station_names_twog) - # assert station - # else: - # assert False - # - # @pytest.mark.wpa2_personal - # @pytest.mark.fiveg - # @pytest.mark.client11a - # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2497", name="WIFI-2497") - # def test_client_wpa2_personal_5g_11a(self, - # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - # get_configuration,lf_tools): - # """ - # - # pytest -m "ratevsrange and bridge and client11a" -s -vvv --skip-testrail --testbed=advanced-02 - # jira- wifi-2497 - # """ - # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - # ssid_name = profile_data["ssid_name"] - # security_key = profile_data["security_key"] - # security = "wpa2" - # mode = "BRIDGE" - # band = "fiveg" - # vlan = 1 - # dut_name = create_lanforge_chamberview_dut - # 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) - # print("station", station) - # - # val = [['modes: 802.11a'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], - # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - # if station: - # time.sleep(3) - # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - # instance_name="BRIDGE_RVR_11A_FIVEG", - # vlan_id=vlan, dut_name=dut_name, raw_lines=val) - # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - # entries = os.listdir("../reports/" + report_name + '/') - # lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") - # pdf = False - # for i in entries: - # if ".pdf" in i: - # pdf = i - # if pdf: - # allure.attach.file(source="../reports/" + report_name + "/" + pdf, - # name=get_configuration["access_point"][0]["model"] + "ratevsrange") - # print("Test Completed... Cleaning up Stations") - # lf_test.Client_disconnect(station_name=station_names_fiveg) - # assert station - # else: - # assert False - # - # @pytest.mark.wpa2_personal - # @pytest.mark.fiveg - # @pytest.mark.client11an - # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2498", name="WIFI-2498") - # def test_client_wpa2_personal_5g_11an(self, - # lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - # get_configuration, lf_tools): - # """ - # - # pytest -m "ratevsrange and bridge and client11an" -s -vvv --skip-testrail --testbed=advanced-02 - # jira- wifi-2498 - # """ - # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - # ssid_name = profile_data["ssid_name"] - # security_key = profile_data["security_key"] - # security = "wpa2" - # mode = "BRIDGE" - # band = "fiveg" - # vlan = 1 - # dut_name = create_lanforge_chamberview_dut - # - # 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) - # print("station", station) - # - # val = [['modes: 802.11an'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], - # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], - # ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] - # if station: - # time.sleep(3) - # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - # instance_name="BRIDGE_RVR_11AN_FIVEG", - # vlan_id=vlan, dut_name=dut_name, raw_lines=val) - # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - # entries = os.listdir("../reports/" + report_name + '/') - # lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") - # pdf = False - # for i in entries: - # if ".pdf" in i: - # pdf = i - # if pdf: - # allure.attach.file(source="../reports/" + report_name + "/" + pdf, - # name=get_configuration["access_point"][0]["model"] + "ratevsrange") - # print("Test Completed... Cleaning up Stations") - # lf_test.Client_disconnect(station_name=station_names_fiveg) - # assert station - # else: - # assert False - # - # @pytest.mark.performance_advanced - # @pytest.mark.wpa2_personal - # @pytest.mark.fiveg - # @pytest.mark.client11ac - # @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2499", name="WIFI-2499") - # def test_client_wpa2_personal_5g_11ac(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - # get_configuration, lf_tools): - # """ - # - # pytest -m "ratevsrange and bridge and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 - # jira- wifi-2499 - # """ - # profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - # ssid_name = profile_data["ssid_name"] - # security_key = profile_data["security_key"] - # security = "wpa2" - # mode = "BRIDGE" - # band = "fiveg" - # vlan = 1 - # dut_name = create_lanforge_chamberview_dut - # - # 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) - # print("station", station) - # - # val = [['modes: 802.11an-AC'], ['pkts: 60;142;256;512;1024;MTU;4000;9000'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], - # ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] - # - # if station: - # time.sleep(3) - # rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, - # instance_name="BRIDGE_RVR_11AC_FIVEG", - # vlan_id=vlan, dut_name=dut_name, raw_lines=val) - # report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - # entries = os.listdir("../reports/" + report_name + '/') - # lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") - # pdf = False - # for i in entries: - # if ".pdf" in i: - # pdf = i - # if pdf: - # allure.attach.file(source="../reports/" + report_name + "/" + pdf, - # name=get_configuration["access_point"][0]["model"] + "ratevsrange") - # print("Test Completed... Cleaning up Stations") - # lf_test.Client_disconnect(station_name=station_names_fiveg) - # assert station - # else: - # assert False + @pytest.mark.wpa2_personal + @pytest.mark.twog + @pytest.mark.client11g + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2496", name="WIFI-2496") + def test_client_wpa2_personal_2g_11g(self, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration, lf_tools): + """ + + pytest -m "ratevsrange and bridge and client11g" -s -vvv --skip-testrail --testbed=advanced-02 + jira- wifi-2496 + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "twog" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + 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) + print("station", station) + + val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + if station: + time.sleep(3) + rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, + instance_name="MODEBRIDGE_RVR_11G_TWOG", + vlan_id=vlan, dut_name=dut_name, raw_lines=val) + report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source="../reports/" + report_name + "/" + pdf, + name=get_configuration["access_point"][0]["model"] + "ratevsrange") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_twog) + assert station + else: + assert False + + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + @pytest.mark.client11a + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2497", name="WIFI-2497") + def test_client_wpa2_personal_5g_11a(self, + lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + get_configuration,lf_tools): + """ + + pytest -m "ratevsrange and bridge and client11a" -s -vvv --skip-testrail --testbed=advanced-02 + jira- wifi-2497 + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "fiveg" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + 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) + print("station", station) + + val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + if station: + time.sleep(3) + rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + instance_name="MODEBRIDGE_RVR_11A_FIVEG", + vlan_id=vlan, dut_name=dut_name, raw_lines=val) + report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source="../reports/" + report_name + "/" + pdf, + name=get_configuration["access_point"][0]["model"] + "ratevsrange") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_fiveg) + assert station + else: + assert False + + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + @pytest.mark.client11an + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2498", name="WIFI-2498") + def test_client_wpa2_personal_5g_11an(self, + lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + get_configuration, lf_tools): + """ + + pytest -m "ratevsrange and bridge and client11an" -s -vvv --skip-testrail --testbed=advanced-02 + jira- wifi-2498 + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "fiveg" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + + 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) + print("station", station) + + val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'], ['attenuator2: 1.1.3059'], + ['attenuations: 0..+50..950'], ['attenuations2: 0..+50..950']] + if station: + time.sleep(3) + rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + instance_name="MODEBRIDGE_RVR_11AN_FIVEG", + vlan_id=vlan, dut_name=dut_name, raw_lines=val) + report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source="../reports/" + report_name + "/" + pdf, + name=get_configuration["access_point"][0]["model"] + "ratevsrange") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_fiveg) + assert station + else: + assert False + + @pytest.mark.performance_advanced + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + @pytest.mark.client11ac + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2499", name="WIFI-2499") + def test_client_wpa2_personal_5g_11ac(self, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, + get_configuration, lf_tools): + """ + + pytest -m "ratevsrange and bridge and client11ac" -s -vvv --skip-testrail --testbed=advanced-02 + jira- wifi-2499 + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "fiveg" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + + 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) + print("station", station) + + val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit;DUT Receive'], ['traffic_types:UDP;TCP'], + ['bandw_options: AUTO'], ['spatial_streams: AUTO'], ['attenuator: 1.1.3034'] ,['attenuator2: 1.1.3059'], ['attenuations: 0..+50..950'],['attenuations2: 0..+50..950']] + + if station: + time.sleep(3) + rvr_o = lf_test.ratevsrange(station_name=station_names_fiveg, mode=mode, + instance_name="MODEBRIDGE_RVR_11AC_FIVEG", + vlan_id=vlan, dut_name=dut_name, raw_lines=val) + report_name = rvr_o.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + entries = os.listdir("../reports/" + report_name + '/') + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Rate vs Range Test") + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source="../reports/" + report_name + "/" + pdf, + name=get_configuration["access_point"][0]["model"] + "ratevsrange") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_fiveg) + assert station + else: + assert False