diff --git a/tests/configuration.py b/tests/configuration.py index f6e07f626..06c3d7048 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -19,15 +19,15 @@ ubuntu@3.130.51.163 -ssh -C -L 8800:lf1:4002 -L 8801:lf1:5901 -L 8802:lf1:8080 -L 8803:lab-ctlr:22 \ --L 8720:lf2:4002 -L 8721:lf2:5901 -L 8722:lf2:8080 -L 8723:lab-ctlr:22 \ --L 8830:lf3:4002 -L 8831:lf3:5901 -L 8832:lf3:8080 -L 8833:lab-ctlr:22 \ --L 8810:lf4:4002 -L 8811:lf4:5901 -L 8812:lf4:8080 -L 8813:lab-ctlr:22 \ --L 8850:lf12:4002 -L 8851:lf12:5901 -L 8852:lf12:8080 -L 8853:lab-ctlr4:22 \ --L 8860:lf13:4002 -L 8861:lf13:5901 -L 8862:lf13:8080 -L 8863:lab-ctlr4:22 \ --L 8870:lf14:4002 -L 8871:lf14:5901 -L 8872:lf14:8080 -L 8873:lab-ctlr4:22 \ --L 8880:lf15:4002 -L 8881:lf15:5901 -L 8882:lf15:8080 -L 8883:lab-ctlr4:22 \ -ubuntu@3.130.51.163 +ssh -C -L 8700:lf1:4002 -L 8701:lf1:5901 -L 8702:lf1:8080 -L 8703:lab-ctlr:22 -L 8704:lf1:22\ + -L 8710:lf2:4002 -L 8711:lf2:5901 -L 8712:lf2:8080 -L 8713:lab-ctlr:22 -L 8714:lf2:22\ + -L 8720:lf3:4002 -L 8721:lf3:5901 -L 8722:lf3:8080 -L 8723:lab-ctlr:22 -L 8724:lf3:22\ + -L 8730:lf4:4002 -L 8731:lf4:5901 -L 8732:lf4:8080 -L 8733:lab-ctlr:22 -L 8734:lf4:22\ + -L 8740:lf12:4002 -L 8741:lf12:5901 -L 8742:lf12:8080 -L 8743:lab-ctlr4:22 -L 8744:lf12:22\ + -L 8750:lf13:4002 -L 8751:lf13:5901 -L 8752:lf13:8080 -L 8753:lab-ctlr4:22 -L 8754:lf13:22\ + -L 8760:lf14:4002 -L 8761:lf14:5901 -L 8762:lf14:8080 -L 8763:lab-ctlr4:22 -L 8764:lf14:22\ + -L 8770:lf15:4002 -L 8771:lf15:5901 -L 8772:lf15:8080 -L 8773:lab-ctlr4:22 -L 8774:lf15:22\ + ubuntu@3.130.51.163 """ @@ -126,20 +126,20 @@ CONFIGURATION = { 'mode': 'wifi5', 'serial': '001122090801', 'jumphost': True, - 'ip': "10.28.3.100", + 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, + 'port': 8723, 'jumphost_tty': '/dev/ttyAP3', - 'version': "latest" + 'version': "next-latest" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.10", - "port": 8080, - "ssh_port": 22, + "ip": "localhost", + "port": 8722, + "ssh_port": 8724, "2.4G-Radio": ["1.1.wiphy4"], "5G-Radio": ["1.1.wiphy5"], "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"], @@ -164,20 +164,20 @@ CONFIGURATION = { 'mode': 'wifi5', 'serial': '68215fda456d', 'jumphost': True, - 'ip': "10.28.3.100", + 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, + 'port': 8733, 'jumphost_tty': "/dev/ttyAP5", - 'version': "latest" + 'version': "release-latest" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.12", - "port": 8080, - "ssh_port": 22, + "ip": "localhost", + "port": 8732, + "ssh_port": 8734, "2.4G-Radio": ["1.1.wiphy4"], "5G-Radio": [ "1.1.wiphy5"], "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"], @@ -574,19 +574,17 @@ CONFIGURATION = { } }, - "basic-ext-03-03": { + "ext-01": { "controller": { - 'url': "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': "1.1.0-SNAPSHOT", - 'commit_date': "2021-04-27" + 'url': 'https://sec-ucentral-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller + 'username': "tip@ucentral.com", + 'password': 'openwifi', }, 'access_point': [ { - 'model': 'ecw5410', - 'mode': 'wifi5', - 'serial': '903cb3944857', + 'model': 'eap102', + 'mode': 'wifi6', + 'serial': '903cb30bcf12', 'jumphost': True, 'ip': "192.168.200.80", 'username': "lanforge", @@ -604,7 +602,7 @@ CONFIGURATION = { "ssh_port": 22, "2.4G-Radio": ["wiphy0"], "5G-Radio": ["wiphy1"], - "AX-Radio": ["wiphy2"], + "AX-Radio": [], "upstream": "1.1.eth1", "upstream_subnet": "192.168.200.1/24", "uplink": "1.1.eth2", diff --git a/tests/conftest.py b/tests/conftest.py index d71821aff..5a75de286 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -134,9 +134,9 @@ def pytest_addoption(parser): help="AP Model which is needed to test" ) parser.addoption( - "--skip-testrail", - action="store_true", - default=False, + "--use-testrail", + action="store_false", + default=True, help="Stop using Testrails" ) @@ -432,12 +432,12 @@ Instantiate Reporting @pytest.fixture(scope="session") def update_report(request, testbed, get_configuration): """used to update the test report on testrail/allure""" - if request.config.getoption("--skip-testrail"): + if request.config.getoption("--use-testrail"): tr_client = Reporting() else: tr_client = APIClient(request.config.getini("tr_url"), request.config.getini("tr_user"), request.config.getini("tr_pass"), request.config.getini("tr_project_id")) - if request.config.getoption("--skip-testrail"): + if request.config.getoption("--use-testrail"): tr_client.rid = "skip testrails" else: projId = tr_client.get_project_id(project_name=request.config.getini("tr_project_id")) diff --git a/tests/e2e/basic/conftest.py b/tests/e2e/basic/conftest.py index d6a599ca9..804db5a8c 100644 --- a/tests/e2e/basic/conftest.py +++ b/tests/e2e/basic/conftest.py @@ -48,7 +48,7 @@ def create_lanforge_chamberview_dut(lf_tools): @pytest.fixture(scope="class") -def setup_profiles(request, setup_controller, testbed, get_equipment_id, fixtures_ver, +def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver, 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() @@ -76,7 +76,7 @@ def setup_profiles(request, setup_controller, testbed, get_equipment_id, fixture 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_id, + 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, diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py index d475e9418..a19cc42d4 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py @@ -46,7 +46,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object): @pytest.mark.wpa_enterprise @pytest.mark.twog def test_wpa_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 2g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa_enterprise and twog" @@ -73,7 +73,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object): @pytest.mark.wpa_enterprise @pytest.mark.fiveg def test_wpa_enterprise_5g(self, station_names_fiveg, get_ap_logs, - setup_profiles, get_lanforge_data, lf_test, update_report, + setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 5g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa_enterprise and fiveg" @@ -99,7 +99,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object): @pytest.mark.wpa2_enterprise @pytest.mark.twog def test_wpa2_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 2g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa2_enterprise and twog" @@ -128,7 +128,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object): @pytest.mark.wpa2_enterprise @pytest.mark.fiveg def test_wpa2_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 2g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa2_enterprise and fiveg" @@ -157,7 +157,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object): @pytest.mark.wpa3_enterprise @pytest.mark.twog def test_wpa3_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 2g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa3_enterprise and twog" @@ -185,7 +185,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object): @pytest.mark.wpa3_enterprise @pytest.mark.fiveg def test_wpa3_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 2g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa3_enterprise and fiveg" @@ -243,7 +243,7 @@ class TestBridgeModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa_wpa2_enterprise_mixed @pytest.mark.twog def test_wpa_wpa2_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 2g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa_wpa2_enterprise_mixed and twog" @@ -271,7 +271,7 @@ class TestBridgeModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa_wpa2_enterprise_mixed @pytest.mark.fiveg def test_wpa_wpa2_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 2g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa_wpa2_enterprise_mixed and fiveg" @@ -299,7 +299,7 @@ class TestBridgeModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa3_enterprise_mixed @pytest.mark.twog def test_wpa3_enterprise_mixed_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): """ wpa enterprise 2g pytest -m "client_connectivity and bridge and enterprise and ttls and wpa3_enterprise_mixed and twog" @@ -326,7 +326,7 @@ class TestBridgeModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa3_enterprise_mixed @pytest.mark.fiveg def test_wpa3_enterprise_mixed_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, + station_names_fiveg, setup_profiles, lf_test, update_report, exit_on_fail, test_cases, radius_info): """ wpa enterprise 2g diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py index 5025e78e8..b912749e8 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py @@ -50,7 +50,7 @@ class TestBridgeModeConnectivitySuiteA(object): @pytest.mark.open @pytest.mark.twog @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2809", name="JIRA LINK") - def test_open_ssid_2g(self, get_vif_state, get_ap_logs, setup_profiles, get_lanforge_data, lf_test, update_report, + def test_open_ssid_2g(self, get_vif_state, get_ap_logs, setup_profiles, lf_test, update_report, station_names_twog, test_cases): """Client Connectivity open ssid 2.4G @@ -76,7 +76,7 @@ class TestBridgeModeConnectivitySuiteA(object): @pytest.mark.open @pytest.mark.fiveg @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2801", name="JIRA LINK") - def test_open_ssid_5g(self, get_vif_state, get_ap_logs, get_lanforge_data, lf_test, test_cases, station_names_fiveg, + def test_open_ssid_5g(self, get_vif_state, get_ap_logs, lf_test, test_cases, station_names_fiveg, update_report): """Client Connectivity open ssid 5G pytest -m "client_connectivity and bridge and general and open and fiveg" @@ -103,7 +103,7 @@ class TestBridgeModeConnectivitySuiteA(object): @pytest.mark.twog @allure.story('wpa 2.4 GHZ Band') @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2801", name="JIRA LINK") - def test_wpa_ssid_2g(self, get_vif_state, get_ap_logs, get_lanforge_data, update_report, + def test_wpa_ssid_2g(self, get_vif_state, get_ap_logs, update_report, lf_test, test_cases, station_names_twog): """Client Connectivity wpa ssid 2.4G pytest -m "client_connectivity and bridge and general and wpa and twog" @@ -155,7 +155,7 @@ class TestBridgeModeConnectivitySuiteA(object): @pytest.mark.wpa2_personal @pytest.mark.twog @allure.story('wpa2_personal 2.4 GHZ Band') - def test_wpa2_personal_ssid_2g(self, get_vif_state, get_ap_logs, get_lanforge_data, lf_test, update_report, test_cases, + def test_wpa2_personal_ssid_2g(self, get_vif_state, get_ap_logs, lf_test, update_report, test_cases, station_names_twog): """Client Connectivity wpa2_personal ssid 2.4G pytest -m "client_connectivity and bridge and general and wpa2_personal and twog" @@ -181,7 +181,7 @@ class TestBridgeModeConnectivitySuiteA(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg @allure.story('wpa2_personal 5 GHZ Band') - def test_wpa2_personal_ssid_5g(self, get_vif_state, get_ap_logs, get_lanforge_data, update_report, test_cases, + def test_wpa2_personal_ssid_5g(self, get_vif_state, get_ap_logs, update_report, test_cases, station_names_fiveg, lf_test): """Client Connectivity wpa2_personal ssid 5G @@ -245,7 +245,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal @pytest.mark.twog @allure.story('open 2.4 GHZ Band') - def test_wpa3_personal_ssid_2g(self, get_vif_state, get_ap_logs, station_names_twog, setup_profiles, get_lanforge_data, lf_test, + def test_wpa3_personal_ssid_2g(self, get_vif_state, get_ap_logs, station_names_twog, setup_profiles, lf_test, update_report, test_cases): """Client Connectivity open ssid 2.4G @@ -271,7 +271,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal @pytest.mark.fiveg @allure.story('open 5 GHZ Band') - def test_wpa3_personal_ssid_5g(self, get_vif_state, get_ap_logs, station_names_fiveg, get_lanforge_data, lf_test, test_cases, + def test_wpa3_personal_ssid_5g(self, get_vif_state, get_ap_logs, station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G pytest -m "client_connectivity and bridge and general and wpa3_personal and fiveg" @@ -296,7 +296,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal_mixed @pytest.mark.twog @allure.story('open 2.4 GHZ Band') - def test_wpa3_personal_mixed_ssid_2g(self, get_vif_state, get_ap_logs, station_names_twog, setup_profiles, get_lanforge_data, + def test_wpa3_personal_mixed_ssid_2g(self, get_vif_state, get_ap_logs, station_names_twog, setup_profiles, lf_test, update_report, test_cases): @@ -323,7 +323,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal_mixed @pytest.mark.fiveg @allure.story('open 5 GHZ Band') - def test_wpa3_personal_mixed_ssid_5g(self, get_vif_state, get_ap_logs, station_names_fiveg, get_lanforge_data, lf_test, + def test_wpa3_personal_mixed_ssid_5g(self, get_vif_state, get_ap_logs, station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G @@ -349,7 +349,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa_wpa2_personal_mixed @pytest.mark.twog @allure.story('wpa wpa2 personal mixed 2.4 GHZ Band') - def test_wpa_wpa2_personal_ssid_2g(self, get_vif_state, get_ap_logs, station_names_twog, setup_profiles, get_lanforge_data, + def test_wpa_wpa2_personal_ssid_2g(self, get_vif_state, get_ap_logs, station_names_twog, setup_profiles, lf_test, update_report, test_cases): @@ -377,7 +377,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa_wpa2_personal_mixed @pytest.mark.fiveg @allure.story('wpa wpa2 personal mixed 5 GHZ Band') - def test_wpa_wpa2_personal_ssid_5g(self, get_vif_state, get_ap_logs, station_names_fiveg, get_lanforge_data, lf_test, test_cases, + def test_wpa_wpa2_personal_ssid_5g(self, get_vif_state, get_ap_logs, station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G pytest -m "client_connectivity and bridge and general and wpa_wpa2_personal_mixed and fiveg" @@ -425,7 +425,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): # # @pytest.mark.wep # @pytest.mark.twog -# def test_wep_2g(self, get_vif_state,station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, +# def test_wep_2g(self, get_vif_state,station_names_twog, setup_profiles, lf_test, update_report, # test_cases, radius_info): # profile_data = setup_params_wep["ssid_modes"]["wep"][0] # ssid_name = profile_data["ssid_name"] @@ -453,7 +453,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): # # @pytest.mark.wep # @pytest.mark.fiveg -# def test_wep_5g(self, get_vif_state,station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, +# def test_wep_5g(self, get_vif_state,station_names_fiveg, setup_profiles, lf_test, update_report, # test_cases, radius_info): # profile_data = setup_params_wep["ssid_modes"]["wep"][1] # ssid_name = profile_data["ssid_name"] diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py index 1a14676f7..cdde8475e 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py @@ -34,7 +34,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object): @pytest.mark.wpa_enterprise @pytest.mark.twog def test_wpa_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa_enterprise"][0] ssid_name = profile_data["ssid_name"] @@ -59,7 +59,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object): @pytest.mark.wpa_enterprise @pytest.mark.fiveg def test_wpa_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa_enterprise"][1] ssid_name = profile_data["ssid_name"] @@ -86,7 +86,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object): @pytest.mark.wpa2_enterprise @pytest.mark.twog def test_wpa2_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa2_enterprise"][0] ssid_name = profile_data["ssid_name"] @@ -113,7 +113,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object): @pytest.mark.wpa2_enterprise @pytest.mark.fiveg def test_wpa2_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa2_enterprise"][1] ssid_name = profile_data["ssid_name"] @@ -139,7 +139,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object): @pytest.mark.twog @pytest.mark.uc_sanity def test_wpa3_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][0] ssid_name = profile_data["ssid_name"] @@ -164,7 +164,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object): @pytest.mark.fiveg @pytest.mark.uc_sanity def test_wpa3_enterprise_5g(self, get_vif_state,station_names_fiveg, get_ap_logs, - setup_profiles, get_lanforge_data, lf_test, update_report, + setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][1] ssid_name = profile_data["ssid_name"] @@ -214,7 +214,7 @@ class TestNATModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa_wpa2_enterprise_mixed @pytest.mark.twog def test_wpa_wpa2_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise_two["ssid_modes"]["wpa_wpa2_enterprise_mixed"][0] ssid_name = profile_data["ssid_name"] @@ -239,7 +239,7 @@ class TestNATModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa_wpa2_enterprise_mixed @pytest.mark.fiveg def test_wpa_wpa2_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise_two["ssid_modes"]["wpa_wpa2_enterprise_mixed"][1] ssid_name = profile_data["ssid_name"] @@ -264,7 +264,7 @@ class TestNATModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa3_enterprise_mixed @pytest.mark.twog def test_wpa3_enterprise_mixed_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise_two["ssid_modes"]["wpa3_enterprise_mixed"][0] ssid_name = profile_data["ssid_name"] @@ -288,7 +288,7 @@ class TestNATModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa3_enterprise_mixed @pytest.mark.fiveg def test_wpa3_enterprise_mixed_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, + station_names_fiveg, setup_profiles, lf_test, update_report, exit_on_fail, test_cases, radius_info): profile_data = setup_params_enterprise_two["ssid_modes"]["wpa3_enterprise_mixed"][1] diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py index 2c91a1d43..eccb09d3b 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py @@ -49,7 +49,7 @@ class TestNATModeConnectivitySuiteA(object): @pytest.mark.twog @allure.story('open 2.4 GHZ Band') def test_open_ssid_2g(self, get_vif_state, get_ap_logs, - setup_profiles, get_lanforge_data, lf_test, update_report, + setup_profiles, lf_test, update_report, station_names_twog, test_cases): """Client Connectivity open ssid 2.4G @@ -78,7 +78,7 @@ class TestNATModeConnectivitySuiteA(object): @pytest.mark.fiveg @allure.story('open 5 GHZ Band') def test_open_ssid_5g(self, get_vif_state, get_ap_logs, - get_lanforge_data, lf_test, test_cases, station_names_fiveg, + lf_test, test_cases, station_names_fiveg, update_report): """Client Connectivity open ssid 5G pytest -m "client_connectivity and NAT and general and open and fiveg" @@ -104,7 +104,7 @@ class TestNATModeConnectivitySuiteA(object): @pytest.mark.wpa @pytest.mark.twog @allure.story('wpa 2.4 GHZ Band') - def test_wpa_ssid_2g(self, get_vif_state, get_ap_logs, get_lanforge_data, update_report, + def test_wpa_ssid_2g(self, get_vif_state, get_ap_logs, update_report, lf_test, test_cases, station_names_twog): """Client Connectivity wpa ssid 2.4G pytest -m "client_connectivity and NAT and general and wpa and twog" @@ -157,7 +157,7 @@ class TestNATModeConnectivitySuiteA(object): @pytest.mark.twog @allure.story('wpa2_personal 2.4 GHZ Band') def test_wpa2_personal_ssid_2g(self, get_vif_state, get_ap_logs, - get_lanforge_data, lf_test, update_report, test_cases, + lf_test, update_report, test_cases, station_names_twog): """Client Connectivity wpa2_personal ssid 2.4G pytest -m "client_connectivity and NAT and general and wpa2_personal and twog" @@ -184,7 +184,7 @@ class TestNATModeConnectivitySuiteA(object): @pytest.mark.fiveg @allure.story('wpa2_personal 5 GHZ Band') def test_wpa2_personal_ssid_5g(self, get_vif_state, get_ap_logs, - get_lanforge_data, update_report, test_cases, + update_report, test_cases, station_names_fiveg, lf_test): """Client Connectivity wpa2_personal ssid 5G @@ -247,7 +247,7 @@ class TestNATModeConnectivitySuiteB(object): @pytest.mark.twog @allure.story('open 2.4 GHZ Band') def test_wpa3_personal_ssid_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, + station_names_twog, setup_profiles, lf_test, update_report, test_cases): """Client Connectivity open ssid 2.4G @@ -274,7 +274,7 @@ class TestNATModeConnectivitySuiteB(object): @pytest.mark.fiveg @allure.story('open 5 GHZ Band') def test_wpa3_personal_ssid_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, get_lanforge_data, lf_test, test_cases, + station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G pytest -m "client_connectivity and NAT and general and wpa3_personal and fiveg" @@ -300,7 +300,7 @@ class TestNATModeConnectivitySuiteB(object): @pytest.mark.twog @allure.story('open 2.4 GHZ Band') def test_wpa3_personal_mixed_ssid_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, + station_names_twog, setup_profiles, lf_test, update_report, test_cases): @@ -328,7 +328,7 @@ class TestNATModeConnectivitySuiteB(object): @pytest.mark.fiveg @allure.story('open 5 GHZ Band') def test_wpa3_personal_mixed_ssid_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, get_lanforge_data, lf_test, + station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G @@ -355,7 +355,7 @@ class TestNATModeConnectivitySuiteB(object): @pytest.mark.twog @allure.story('wpa wpa2 personal mixed 2.4 GHZ Band') def test_wpa_wpa2_personal_ssid_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, + station_names_twog, setup_profiles, lf_test, update_report, test_cases): @@ -384,7 +384,7 @@ class TestNATModeConnectivitySuiteB(object): @pytest.mark.fiveg @allure.story('wpa wpa2 personal mixed 5 GHZ Band') def test_wpa_wpa2_personal_ssid_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, get_lanforge_data, lf_test, test_cases, + station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G pytest -m "client_connectivity and NAT and general and wpa_wpa2_personal_mixed and fiveg" @@ -433,7 +433,7 @@ class TestNATModeConnectivitySuiteB(object): # # @pytest.mark.wep # @pytest.mark.twog -# def test_wep_2g(self, get_vif_state,station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, +# def test_wep_2g(self, get_vif_state,station_names_twog, setup_profiles, lf_test, update_report, # test_cases, radius_info): # profile_data = setup_params_wep["ssid_modes"]["wep"][0] # ssid_name = profile_data["ssid_name"] @@ -461,7 +461,7 @@ class TestNATModeConnectivitySuiteB(object): # # @pytest.mark.wep # @pytest.mark.fiveg -# def test_wep_5g(self, get_vif_state,station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, +# def test_wep_5g(self, get_vif_state,station_names_fiveg, setup_profiles, lf_test, update_report, # test_cases, radius_info): # profile_data = setup_params_wep["ssid_modes"]["wep"][1] # ssid_name = profile_data["ssid_name"] diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py index f0b518851..cc1b478fc 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py @@ -34,7 +34,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object): @pytest.mark.wpa_enterprise @pytest.mark.twog def test_wpa_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa_enterprise"][0] @@ -60,7 +60,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object): @pytest.mark.wpa_enterprise @pytest.mark.fiveg def test_wpa_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa_enterprise"][1] @@ -88,7 +88,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object): @pytest.mark.wpa2_enterprise @pytest.mark.twog def test_wpa2_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa2_enterprise"][0] @@ -116,7 +116,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object): @pytest.mark.wpa2_enterprise @pytest.mark.fiveg def test_wpa2_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa2_enterprise"][1] @@ -143,7 +143,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object): @pytest.mark.twog @pytest.mark.uc_sanity def test_wpa3_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][0] @@ -169,7 +169,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object): @pytest.mark.fiveg @pytest.mark.uc_sanity def test_wpa3_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][1] @@ -220,7 +220,7 @@ class TestVLANModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa_wpa2_enterprise_mixed @pytest.mark.twog def test_wpa_wpa2_enterprise_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise_two["ssid_modes"]["wpa_wpa2_enterprise_mixed"][0] @@ -246,7 +246,7 @@ class TestVLANModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa_wpa2_enterprise_mixed @pytest.mark.fiveg def test_wpa_wpa2_enterprise_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, + station_names_fiveg, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise_two["ssid_modes"]["wpa_wpa2_enterprise_mixed"][1] @@ -272,7 +272,7 @@ class TestVLANModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa3_enterprise_mixed @pytest.mark.twog def test_wpa3_enterprise_mixed_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, + station_names_twog, setup_profiles, lf_test, update_report, test_cases, radius_info, exit_on_fail): profile_data = setup_params_enterprise_two["ssid_modes"]["wpa3_enterprise_mixed"][0] @@ -297,7 +297,7 @@ class TestVLANModeEnterpriseTTLSSuiteTwo(object): @pytest.mark.wpa3_enterprise_mixed @pytest.mark.fiveg def test_wpa3_enterprise_mixed_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, setup_profiles, get_lanforge_data, + station_names_fiveg, setup_profiles, lf_test, update_report, exit_on_fail, test_cases, radius_info): diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py index a899bf0d9..1cc20c83a 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py @@ -47,7 +47,7 @@ class TestvlanModeConnectivitySuiteA(object): @pytest.mark.twog @allure.story('open 2.4 GHZ Band') def test_open_ssid_2g(self, get_vif_state, get_ap_logs, - setup_profiles, get_lanforge_data, lf_test, update_report, + setup_profiles, lf_test, update_report, station_names_twog, test_cases): """Client Connectivity open ssid 2.4G @@ -73,7 +73,7 @@ class TestvlanModeConnectivitySuiteA(object): @pytest.mark.fiveg @allure.story('open 5 GHZ Band') def test_open_ssid_5g(self, get_vif_state, get_ap_logs, - get_lanforge_data, lf_test, test_cases, station_names_fiveg, + lf_test, test_cases, station_names_fiveg, update_report): """Client Connectivity open ssid 5G pytest -m "client_connectivity and vlan and general and open and fiveg" @@ -100,7 +100,7 @@ class TestvlanModeConnectivitySuiteA(object): @pytest.mark.twog @allure.story('wpa 2.4 GHZ Band') def test_wpa_ssid_2g(self, get_vif_state, get_ap_logs, - get_lanforge_data, update_report, + update_report, lf_test, test_cases, station_names_twog): """Client Connectivity wpa ssid 2.4G pytest -m "client_connectivity and vlan and general and wpa and twog" @@ -154,7 +154,7 @@ class TestvlanModeConnectivitySuiteA(object): @pytest.mark.twog @allure.story('wpa2_personal 2.4 GHZ Band') def test_wpa2_personal_ssid_2g(self, get_vif_state, get_ap_logs, - get_lanforge_data, lf_test, update_report, test_cases, + lf_test, update_report, test_cases, station_names_twog): """Client Connectivity wpa2_personal ssid 2.4G pytest -m "client_connectivity and vlan and general and wpa2_personal and twog" @@ -181,7 +181,7 @@ class TestvlanModeConnectivitySuiteA(object): @pytest.mark.fiveg @allure.story('wpa2_personal 5 GHZ Band') def test_wpa2_personal_ssid_5g(self, get_vif_state, get_ap_logs, - get_lanforge_data, update_report, test_cases, + update_report, test_cases, station_names_fiveg, lf_test): """Client Connectivity wpa2_personal ssid 5G @@ -245,7 +245,7 @@ class TestvlanModeConnectivitySuiteTwo(object): @pytest.mark.twog @allure.story('open 2.4 GHZ Band') def test_wpa3_personal_ssid_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, lf_test, + station_names_twog, setup_profiles, lf_test, update_report, test_cases): """Client Connectivity open ssid 2.4G @@ -273,7 +273,7 @@ class TestvlanModeConnectivitySuiteTwo(object): @pytest.mark.fiveg @allure.story('open 5 GHZ Band') def test_wpa3_personal_ssid_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, get_lanforge_data, lf_test, test_cases, + station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G pytest -m "client_connectivity and vlan and general and wpa3_personal and fiveg" @@ -299,7 +299,7 @@ class TestvlanModeConnectivitySuiteTwo(object): @pytest.mark.twog @allure.story('open 2.4 GHZ Band') def test_wpa3_personal_mixed_ssid_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, + station_names_twog, setup_profiles, lf_test, update_report, test_cases): @@ -327,7 +327,7 @@ class TestvlanModeConnectivitySuiteTwo(object): @pytest.mark.fiveg @allure.story('open 5 GHZ Band') def test_wpa3_personal_mixed_ssid_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, get_lanforge_data, lf_test, + station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G @@ -354,7 +354,7 @@ class TestvlanModeConnectivitySuiteTwo(object): @pytest.mark.twog @allure.story('wpa wpa2 personal mixed 2.4 GHZ Band') def test_wpa_wpa2_personal_ssid_2g(self, get_vif_state, get_ap_logs, - station_names_twog, setup_profiles, get_lanforge_data, + station_names_twog, setup_profiles, lf_test, update_report, test_cases): @@ -383,7 +383,7 @@ class TestvlanModeConnectivitySuiteTwo(object): @pytest.mark.fiveg @allure.story('wpa wpa2 personal mixed 5 GHZ Band') def test_wpa_wpa2_personal_ssid_5g(self, get_vif_state, get_ap_logs, - station_names_fiveg, get_lanforge_data, lf_test, test_cases, + station_names_fiveg, lf_test, test_cases, update_report): """Client Connectivity open ssid 2.4G pytest -m "client_connectivity and vlan and general and wpa_wpa2_personal_mixed and fiveg" @@ -432,7 +432,7 @@ class TestvlanModeConnectivitySuiteTwo(object): # # @pytest.mark.wep # @pytest.mark.twog -# def test_wep_2g(self, get_vif_state,station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, +# def test_wep_2g(self, get_vif_state,station_names_twog, setup_profiles, lf_test, update_report, # test_cases, radius_info): # profile_data = setup_params_wep["ssid_modes"]["wep"][0] # ssid_name = profile_data["ssid_name"] @@ -460,7 +460,7 @@ class TestvlanModeConnectivitySuiteTwo(object): # # @pytest.mark.wep # @pytest.mark.fiveg -# def test_wep_5g(self, get_vif_state,station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, +# def test_wep_5g(self, get_vif_state,station_names_fiveg, setup_profiles, lf_test, update_report, # test_cases, radius_info): # profile_data = setup_params_wep["ssid_modes"]["wep"][1] # ssid_name = profile_data["ssid_name"] diff --git a/tests/fixtures_2x.py b/tests/fixtures_2x.py index 22ac7fc9d..10ac41e1d 100644 --- a/tests/fixtures_2x.py +++ b/tests/fixtures_2x.py @@ -318,7 +318,7 @@ class Fixtures_2x: version_list.append(version) return version_list - def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_id, + 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):