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 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", diff --git a/tests/conftest.py b/tests/conftest.py index d678713cd..31e663f25 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,33 @@ 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): + dut_name = "" + 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/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..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 @@ -8,33 +8,22 @@ """ import os import time - import pytest import allure 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, 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 +41,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,26 +57,25 @@ 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) print("station", station) - val = [['modes: 802.11b'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types: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: time.sleep(3) rvr_o = lf_test.ratevsrange(station_name=station_names_twog, mode=mode, - instance_name="BRIDGE_RVR_11B", + 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) 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: @@ -99,16 +87,15 @@ 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 @@ -116,7 +103,8 @@ class TestRatevsRangeBridge(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): """ @@ -132,24 +120,22 @@ 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) print("station", station) - val = [['modes: 802.11g'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + 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="BRIDGE_RVR_11G", + 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: @@ -159,17 +145,6 @@ class TestRatevsRangeBridge(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)) - 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 @@ -177,7 +152,8 @@ class TestRatevsRangeBridge(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): """ @@ -193,24 +169,22 @@ 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) print("station", station) - val = [['modes: 802.11a'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + 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="BRIDGE_RVR_11A", + 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: @@ -220,15 +194,6 @@ class TestRatevsRangeBridge(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=['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 @@ -236,7 +201,8 @@ class TestRatevsRangeBridge(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): """ @@ -252,24 +218,23 @@ 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) print("station", station) - val = [['modes: 802.11an'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + 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="BRIDGE_RVR_11AN", + 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: @@ -279,25 +244,16 @@ class TestRatevsRangeBridge(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) - 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.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, + @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): """ @@ -312,24 +268,23 @@ 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) print("station", station) - val = [['modes: 802.11an-AC'], ['pkts: MTU'], ['directions: DUT Transmit'], ['traffic_types:TCP'], + 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="BRIDGE_RVR_11AC", + 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: @@ -339,15 +294,6 @@ class TestRatevsRangeBridge(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) - 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 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..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 @@ -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], @@ -42,18 +38,17 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -@pytest.mark.Mhz20 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,24 +59,25 @@ 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.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", + 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) 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 +85,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 +106,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 +123,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: 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", + 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 + '/') + 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 +148,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 +166,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,25 +183,22 @@ 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.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", + 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 + '/') + 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 +208,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 +224,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,25 +241,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'], ['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", + 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 + '/') + 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 +269,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 +284,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 +300,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']] + 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", + 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 + '/') + 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 +328,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 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 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..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,22 +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 } -@pytest.mark.Multi_Sta_Thpt -@pytest.mark.wifi5 -@pytest.mark.wifi6 +@allure.suite("performance") +@allure.feature("BRIDGE MODE WPA2 PERSONAL Multi_Station_Throughput") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -39,14 +38,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" + 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 +53,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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", 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_1", 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") @@ -81,13 +77,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" + 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 +91,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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", + 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 +119,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" + 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 +133,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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", 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_3", 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") @@ -166,13 +158,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 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"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -180,41 +172,40 @@ 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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", 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_4", 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.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.twog @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 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"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -222,41 +213,40 @@ 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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", 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_5", 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.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.twog @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" + 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 @@ -264,41 +254,40 @@ 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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", 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_6", 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.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.twog @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 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"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -306,41 +295,40 @@ 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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", 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_7", 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.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.twog @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 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"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -348,23 +336,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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", 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_8", 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") @@ -375,13 +361,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" + 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 @@ -389,23 +375,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, - instance_name="multistathpt_instance_wpa2p_2g_bridge", 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_9", 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") @@ -416,13 +400,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" + 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 @@ -430,23 +414,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", 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") @@ -457,13 +440,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" + 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 @@ -471,23 +454,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", 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") @@ -498,14 +480,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" + 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 @@ -513,23 +495,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", 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") @@ -540,13 +521,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 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"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -554,23 +535,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", 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") @@ -581,13 +561,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" + 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 @@ -595,23 +575,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", 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") @@ -622,13 +601,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" + 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 @@ -636,23 +615,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", 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") @@ -663,13 +641,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" + 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 @@ -677,23 +655,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", 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") @@ -704,13 +681,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" + 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 @@ -718,23 +695,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", 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") @@ -745,13 +721,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" + 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 @@ -759,23 +735,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", 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") @@ -786,13 +761,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 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"] - ssid_5G = profile_data[1]["ssid_name"] + dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 @@ -800,23 +775,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", 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") @@ -827,13 +801,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" + 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 @@ -841,23 +815,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", 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") @@ -868,13 +841,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" + 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 @@ -882,23 +855,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", 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") @@ -909,13 +881,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" + 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 @@ -923,23 +895,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", 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") @@ -950,13 +921,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" + 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 @@ -964,41 +935,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", 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" + 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 @@ -1006,23 +975,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", 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 75bec9fc2..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,22 +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 } -@pytest.mark.Multi_Sta_Thpt -@pytest.mark.wifi5 -@pytest.mark.wifi6 +@allure.suite("performance") +@allure.feature("BRIDGE MODE WPA2 PERSONAL Multi_Station_Throughput") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -41,12 +40,12 @@ 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"] - 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 +56,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 +65,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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", 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_1", 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") @@ -83,12 +80,12 @@ 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"] - 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 +96,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 +106,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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", + 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, @@ -128,12 +123,12 @@ 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"] - 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 +139,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 +148,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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", 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_3", 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") @@ -170,12 +163,12 @@ 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"] - 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 +179,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,14 +188,15 @@ 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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", 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_4", 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") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.fiveg @@ -213,12 +205,12 @@ 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"] - 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 @@ -229,10 +221,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") @@ -240,14 +230,15 @@ 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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", 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_5", 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") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.fiveg @@ -256,12 +247,12 @@ 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"] - 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 @@ -272,10 +263,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") @@ -283,14 +272,15 @@ 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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", 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_6", 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") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.fiveg @@ -299,12 +289,12 @@ 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"] - 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 @@ -315,10 +305,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") @@ -326,14 +314,15 @@ 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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", 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_7", 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") assert True + @pytest.mark.multi_sta_perf_throughput @pytest.mark.tcp_udp_ul_dl @pytest.mark.wpa2_personal @pytest.mark.fiveg @@ -342,12 +331,12 @@ 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"] - 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 @@ -358,10 +347,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") @@ -369,28 +356,27 @@ 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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", 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_8", 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") 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"] - 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 @@ -401,10 +387,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") @@ -412,9 +396,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, - instance_name="multistathpt_instance_wpa2p_5g_bridge", 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_9", 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") @@ -427,12 +411,12 @@ 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"] - 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 @@ -443,10 +427,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") @@ -454,9 +436,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", 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") @@ -469,12 +452,12 @@ 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"] - 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 @@ -485,10 +468,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") @@ -496,9 +477,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", 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") @@ -511,12 +493,12 @@ 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"] - 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 @@ -527,10 +509,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") @@ -538,9 +518,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", 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") @@ -553,12 +534,12 @@ 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"] - 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 @@ -569,10 +550,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") @@ -580,9 +559,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", 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") @@ -595,12 +575,12 @@ 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"] - 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 @@ -611,10 +591,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") @@ -622,9 +600,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", 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") @@ -637,12 +616,12 @@ 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"] - 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 @@ -653,10 +632,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") @@ -664,9 +641,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", 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") @@ -679,12 +657,12 @@ 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"] - 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 @@ -695,10 +673,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") @@ -706,9 +682,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", 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") @@ -721,12 +698,12 @@ 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"] - 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 @@ -737,10 +714,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") @@ -748,9 +723,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", 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") @@ -763,12 +739,12 @@ 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"] - 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 @@ -779,10 +755,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") @@ -790,9 +764,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", 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") @@ -805,12 +780,12 @@ 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"] - 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 @@ -821,10 +796,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") @@ -832,9 +805,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", 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") @@ -847,12 +821,12 @@ 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"] - 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 @@ -863,10 +837,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") @@ -874,9 +846,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", 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") @@ -889,12 +862,12 @@ 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"] - 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 @@ -905,10 +878,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") @@ -916,9 +887,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", 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") @@ -931,12 +903,12 @@ 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"] - 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 @@ -947,10 +919,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") @@ -958,9 +928,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", 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") @@ -973,12 +944,12 @@ 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"] - 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 @@ -989,10 +960,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") @@ -1000,9 +969,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", 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") @@ -1015,12 +985,12 @@ 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"] - 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 @@ -1031,10 +1001,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") @@ -1042,9 +1010,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", 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") diff --git a/tests/e2e/interOp/conftest.py b/tests/e2e/interOp/conftest.py index 1d0289385..34683de52 100644 --- a/tests/e2e/interOp/conftest.py +++ b/tests/e2e/interOp/conftest.py @@ -196,39 +196,40 @@ 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 not skip_lf: + lf_tools.reset_scenario() # 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 @@ -257,16 +258,21 @@ def failure_tracking_fixture(request): yield tests_failed_during_module -@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 +empty_get_vif_state_list = [] + +@pytest.fixture(scope="class") +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 empty_get_vif_state_list @pytest.hookimpl(tryfirst=True, hookwrapper=True) def pytest_runtest_makereport(item, call): 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