diff --git a/libs/tip_2x/tip_2x.py b/libs/tip_2x/tip_2x.py index 71548c8b8..e3cde14e7 100644 --- a/libs/tip_2x/tip_2x.py +++ b/libs/tip_2x/tip_2x.py @@ -168,10 +168,16 @@ class tip_2x: for i in base_dict: base_dict[i] = [] for i in requested_combination: - if i[0] in self.supported_bands: - base_dict[i[0]].append(self.tip_2x_specific_encryption_translation[i[1]]) - if i[1] in self.supported_bands: - base_dict[i[1]].append((self.tip_2x_specific_encryption_translation[i[0]])) + sec_mode = list(set(i) & set(self.tip_2x_specific_encryption_translation)) + bands = i.copy() + bands.remove(sec_mode[0]) + [base_dict[j].append(self.tip_2x_specific_encryption_translation[sec_mode[0]]) for j in bands] + + # for i in requested_combination: + # if i[0] in self.supported_bands: + # base_dict[i[0]].append(self.tip_2x_specific_encryption_translation[i[1]]) + # if i[1] in self.supported_bands: + # base_dict[i[1]].append((self.tip_2x_specific_encryption_translation[i[0]])) temp = [] for i in list(base_dict.values()): for j in i: diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py index 889c690b0..240fb1abb 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py @@ -5,12 +5,10 @@ """ -import os import allure import pytest -pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release] setup_params_general = { "mode": "BRIDGE", @@ -32,8 +30,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: Bridge mode") +@allure.sub_suite("Open security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceBridge(object): +class TestOpenDualbandPerformanceBridge(object): """ pytest -m "performance and dual_band_test and bridge and open and twog and fiveg" """ @@ -41,31 +43,30 @@ class TestDualbandPerformanceBridge(object): @pytest.mark.open @pytest.mark.twog @pytest.mark.fiveg - def test_client_open_bridge(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of bridge mode") + def test_client_open_bridge(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with open encryption + pytest -m "dual_band_test and open" + """ profile_data = setup_params_general["ssid_modes"]["open"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] mode = "BRIDGE" vlan = 1 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-bridge-open" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_openp_bridge_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") - assert True + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py index f0c19b190..1437bef20 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py @@ -5,12 +5,10 @@ """ -import os import allure import pytest pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.performance_release]#, -# pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "NAT", @@ -32,8 +30,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: NAT mode") +@allure.sub_suite("Open security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceNat(object): +class TestOpenDualbandPerformanceNat(object): """ pytest -m "performance and dual_band_test and nat and open and twog and fiveg" """ @@ -41,31 +43,30 @@ class TestDualbandPerformanceNat(object): @pytest.mark.open @pytest.mark.twog @pytest.mark.fiveg - def test_client_open_nat(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of NAT mode") + def test_client_open_bridge(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with open encryption + pytest -m "dual_band_test and open" + """ profile_data = setup_params_general["ssid_modes"]["open"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut - mode = "NAT" + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] + mode = "NAT-WAN" vlan = 1 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-bridge-open" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_openp_nat_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test Open Security Bridge") - assert True + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py index 92f13cb6c..6c22bccf8 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py @@ -1,6 +1,6 @@ """ Dual Band Performance Test : VLAN Mode - pytest -m "performance and dual_band_test and VLAN" + pytest -m "performance and dual_band_test and vlan" """ @@ -9,14 +9,13 @@ import os import allure import pytest -pytestmark = [pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release] setup_params_general = { "mode": "VLAN", "ssid_modes": { "open": [ - {"ssid_name": "ssid_openp_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} + {"ssid_name": "ssid_openp_2g", "appliedRadios": ["2G", "5G"], "security_key": "something", "vlan": 100} ]}, "rf": {}, "radius": False @@ -32,8 +31,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: VLAN mode") +@allure.sub_suite("Open security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceVLAN(object): +class TestOpenDualbandPerformanceVLAN(object): """ pytest -m "performance and dual_band_test and vlan and open and twog and fiveg" """ @@ -41,31 +44,30 @@ class TestDualbandPerformanceVLAN(object): @pytest.mark.open @pytest.mark.twog @pytest.mark.fiveg - def test_client_open_vlan(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of and VLAN mode") + def test_client_open_bridge(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with open encryption + pytest -m "dual_band_test and open" + """ profile_data = setup_params_general["ssid_modes"]["open"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] mode = "VLAN" - vlan = 100 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + vlan = [100] + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-bridge-open" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_openp_VLAN_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test Open Security Vlan Mode") - assert True + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py index e74876e80..5cdb5d655 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py @@ -5,12 +5,11 @@ """ -import os import allure import pytest pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, - pytest.mark.single_station_dual_band_throughput]# pytest.mark.usefixtures("setup_test_run")] + pytest.mark.single_station_dual_band_throughput] setup_params_general = { "mode": "BRIDGE", @@ -32,8 +31,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: Bridge mode") +@allure.sub_suite("wpa3_personal security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceBridge(object): +class TestWpa3DualbandPerformanceBridge(object): """ pytest -m "performance and dual_band_test and bridge and wpa3_personal and twog and fiveg" """ @@ -42,31 +45,30 @@ class TestDualbandPerformanceBridge(object): @pytest.mark.wpa3_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa3_personal_bridge(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of bridge mode") + def test_client_wpa3_personal_bridge(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa3_personal encryption + pytest -m "dual_band_test and wpa3_personal" + """ profile_data = setup_params_general["ssid_modes"]["wpa3_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] mode = "BRIDGE" vlan = 1 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-bridge-wpa3" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa3p_BRIDGE_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Wpa3 Personal Test") - assert True \ No newline at end of file + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description \ No newline at end of file diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py index e96e84cdd..064c437e4 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py @@ -5,19 +5,17 @@ """ -import os import allure import pytest -pytestmark = [pytest.mark.nat, pytest.mark.dual_band_test]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.nat, pytest.mark.dual_band_test] setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_personal_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something", "vlan": 100} + {"ssid_name": "ssid_wpa3_personal_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something"} ]}, "rf": {}, "radius": False @@ -33,8 +31,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: NAT mode") +@allure.sub_suite("wpa3_personal security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceNat(object): +class TestWpa3DualbandPerformanceNat(object): """ pytest -m "performance and dual_band_test and nat and wpa3_personal and twog and fiveg." """ @@ -43,31 +45,30 @@ class TestDualbandPerformanceNat(object): @pytest.mark.wpa3_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa3_personal_nat(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of NAT mode") + def test_client_wpa3_personal_nat(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa3_personal encryption + pytest -m "dual_band_test and wpa3_personal" + """ profile_data = setup_params_general["ssid_modes"]["wpa3_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut - mode = "NAT" - vlan = 100 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] + mode = "NAT-WAN" + vlan = 1 + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-nat-wpa3" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa3p_NAT_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Wpa3 NAT Test") - assert True \ No newline at end of file + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description \ No newline at end of file diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py index 425c7c077..c8f026ab7 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py @@ -5,12 +5,10 @@ """ -import os import allure import pytest -pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test] setup_params_general = { @@ -33,8 +31,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: VLAN mode") +@allure.sub_suite("wpa3_personal security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceVlan(object): +class TestWpa3DualbandPerformanceVlan(object): """ pytest -m "performance and dual_band_test and vlan and wpa3_personal and twog and fiveg" """ @@ -43,31 +45,30 @@ class TestDualbandPerformanceVlan(object): @pytest.mark.wpa3_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa3_personal_vlan(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of VLAN mode") + def test_client_wpa3_personal_vlan(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa3_personal encryption + pytest -m "dual_band_test and wpa3_personal" + """ profile_data = setup_params_general["ssid_modes"]["wpa3_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] mode = "VLAN" - vlan = 100 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + vlan = [100] + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-vlan-wpa3" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa3p_VLAN_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Wpa3 Vlan Test") - assert True \ No newline at end of file + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description \ No newline at end of file diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py index 0f25096d0..d29c29cd3 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py @@ -1,16 +1,15 @@ """ Dual Band Performance Test : BRIDGE Mode - pytest -m "performance and dual_band_test and BRIDGE" + pytest -m "performance and dual_band_test and bridge" """ -import os import allure import pytest pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, - pytest.mark.single_station_dual_band_throughput]# pytest.mark.usefixtures("setup_test_run")] + pytest.mark.single_station_dual_band_throughput] setup_params_general = { "mode": "BRIDGE", @@ -32,39 +31,43 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: Bridge mode") +@allure.sub_suite("wpa2_personal security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceBRIDGE(object): +class TestWpa2DualbandPerformanceBridge(object): """ - pytest -m "performance and dual_band_test and BRIDGE and wpa2_personal and twog and fiveg" + pytest -m "performance and dual_band_test and bridge and wpa2_personal and twog and fiveg" """ @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3918", name="WIFI-3918") @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa2_personal_bridge(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of bridge mode") + def test_client_wpa2_personal_bridge(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa2_personal encryption + pytest -m "dual_band_test and wpa2_personal" + """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] mode = "BRIDGE" vlan = 1 - print(lf_tools.dut_idx_mapping) - dut_5g = "" - dut_2g = "" + dut_5g, dut_2g = "", "" influx_tags = "dual-band-bridge-wpa2" - for i in lf_tools.dut_idx_mapping: - if lf_tools.dut_idx_mapping[i][3] == "5G": - dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - 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) + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa2p_BRIDGE_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, move_to_influx=False) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test Wpa2 Bridge") - lf_tools.attach_report_kpi(report_name=report_name) - assert True + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py index dbef0cce3..a2e32dbc9 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py @@ -31,8 +31,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: NAT mode") +@allure.sub_suite("wpa2_personal security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceNat(object): +class TestWpa2DualbandPerformanceNat(object): """ pytest -m "performance and dual_band_test and nat and wpa2_personal and twog and fiveg" """ @@ -40,30 +44,30 @@ class TestDualbandPerformanceNat(object): @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa2_personal_nat(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of NAT mode") + def test_client_wpa2_personal_bridge(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa2_personal encryption + pytest -m "dual_band_test and wpa2_personal" + """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut - mode = "NAT" + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] + mode = "NAT-WAN" vlan = 1 - print(lf_tools.dut_idx_mapping) - dut_5g = "" - dut_2g = "" + dut_5g, dut_2g = "", "" influx_tags = "dual-band-nat-wpa2" - for i in lf_tools.dut_idx_mapping: - if lf_tools.dut_idx_mapping[i][3] == "5G": - dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] - 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) + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa2p_nat_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, move_to_influx=False) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test Wpa2 Nat") - lf_tools.attach_report_kpi(report_name=report_name) - assert True + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py index 851888f4d..5ac578c6f 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py @@ -1,6 +1,6 @@ """ Dual Band Performance Test : VLAN Mode - pytest -m "performance and dual_band_test and VLAN" + pytest -m "performance and dual_band_test and vlan" """ @@ -9,8 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.vlan]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.vlan] setup_params_general = { @@ -33,8 +32,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: VLAN mode") +@allure.sub_suite("wpa2_personal security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceVLAN(object): +class TestWpa2DualbandPerformanceVLAN(object): """ pytest -m "performance and dual_band_test and VLAN and wpa2_personal and twog and fiveg" """ @@ -42,31 +45,30 @@ class TestDualbandPerformanceVLAN(object): @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa2_personal_vlan(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of VLAN mode") + def test_client_wpa2_personal_bridge(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa2_personal encryption + pytest -m "dual_band_test and wpa2_personal" + """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] mode = "VLAN" - vlan = 100 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + vlan = [100] + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-vlan-wpa2" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa2p_VLAN_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test Wpa2 Vlan") - assert True + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py index 7d69ed5ff..3d2604c9a 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py @@ -10,7 +10,7 @@ import allure import pytest pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, - pytest.mark.single_station_dual_band_throughput]# pytest.mark.usefixtures("setup_test_run")] + pytest.mark.single_station_dual_band_throughput] setup_params_general = { "mode": "BRIDGE", @@ -32,8 +32,13 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: Bridge mode") +@allure.sub_suite("wpa security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceBRIDGE(object): +@pytest.mark.usefixtures("setup_configuration") +class TestWpaDualbandPerformanceBridge(object): """ pytest -m "performance and dual_band_test and bridge and wpa_personal and twog and fiveg" """ @@ -42,31 +47,30 @@ class TestDualbandPerformanceBRIDGE(object): @pytest.mark.wpa @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa_personal_bridge(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of bridge mode") + def test_client_wpa_personal_bridge(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa encryption + pytest -m "dual_band_test and wpa" + """ profile_data = setup_params_general["ssid_modes"]["wpa"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] mode = "BRIDGE" vlan = 1 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-bridge-wpa" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpap_BRIDGE_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Wpa Bridge Test") - assert True \ No newline at end of file + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py index 089dc828e..d45c5d384 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py @@ -31,41 +31,44 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: NAT mode") +@allure.sub_suite("wpa security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceNat(object): +class TestWpaDualbandPerformanceNat(object): """ pytest -m "performance and dual_band_test and nat and wpa_personal and twog and fiveg" """ @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3726", name="WIFI-3726") - @pytest.mark.wpa_personal + @pytest.mark.wpa @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa_personal_nat(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of NAT mode") + def test_client_wpa_personal_nat(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa encryption + pytest -m "dual_band_test and wpa" + """ profile_data = setup_params_general["ssid_modes"]["wpa"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut - mode = "NAT" + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] + mode = "NAT-WAN" vlan = 1 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-bridge-wpa" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpap_nat_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Wpa Nat Test") - assert True \ No newline at end of file + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py index b177e9bb4..59efb8c9e 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py @@ -9,9 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test]#, -# pytest.mark.usefixtures("setup_test_run")] - +pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test] setup_params_general = { "mode": "VLAN", @@ -33,8 +31,12 @@ setup_params_general = { indirect=True, scope="class" ) +@allure.parent_suite("Dual Band Tests") +@allure.suite("Dual Band Tests: VLAN mode") +@allure.sub_suite("wpa security") +@allure.feature("Dual band performance test") @pytest.mark.usefixtures("setup_configuration") -class TestDualbandPerformanceVLAN(object): +class TestWpaDualbandPerformanceVLAN(object): """ pytest -m "performance and dual_band_test and vlan and wpa_personal and twog and fiveg" """ @@ -43,31 +45,30 @@ class TestDualbandPerformanceVLAN(object): @pytest.mark.wpa @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa_personal_vlan(self, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + @allure.title("Test Dual Band with ApAuto test of VLAN mode") + def test_client_wpa_personal_vlan(self, get_test_library, setup_configuration, check_connectivity): + """ + Dual Band Test with wpa encryption + pytest -m "dual_band_test and wpa" + """ profile_data = setup_params_general["ssid_modes"]["wpa"] - ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] - dut_name = create_lanforge_chamberview_dut - mode = "VLAN" - vlan = 100 - print(lf_tools.dut_idx_mapping) - 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: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") + ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"] + dut_name = list(setup_configuration.keys())[0] + mode = "BRIDGE" + vlan = [100] + dut_5g, dut_2g = "", "" + influx_tags = "dual-band-bridge-wpa" + for i in setup_configuration[dut_name]['ssid_data']: + get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values()) + if get_test_library.dut_idx_mapping[str(i)][3] == "5G": + dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] + if get_test_library.dut_idx_mapping[str(i)][3] == "2G": + dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4] - dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpap_VLAN_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) - report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test Wpa Vlan") - assert True \ No newline at end of file + result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan, + dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, + move_to_influx=False, dut_data=setup_configuration) + if result: + assert True + else: + assert False, description