From e391837ab4601c1bce705368fc3047bfd3527cda Mon Sep 17 00:00:00 2001 From: karthikaeyetea Date: Tue, 18 Oct 2022 17:32:42 +0530 Subject: [PATCH 1/4] Refractored dvlan Signed-off-by: karthikaeyetea --- tests/conftest.py | 11 + .../test_dynamic_over_ssid_fiveg_wpa2.py | 65 +- .../fiveg/test_dynamic_vlan_fiveg_wpa2.py | 428 ++--- .../twog/test_dynamic_over_ssid_twog_wpa2.py | 46 +- .../twog/test_dynamic_vlan_twog_wpa2.py | 342 ++-- tests/lab_info.json | 1431 ----------------- 6 files changed, 493 insertions(+), 1830 deletions(-) delete mode 100644 tests/lab_info.json diff --git a/tests/conftest.py b/tests/conftest.py index cfd744fba..794423602 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -100,6 +100,12 @@ def pytest_addoption(parser): help="Use Interop IoS Test Package for tests" ) + parser.addoption( + "--port", + default=False, + help="Select the port for AP Up Down tests" + ) + @pytest.fixture(scope="session") def get_lab_info(): @@ -125,6 +131,11 @@ def selected_testbed(request): current_testbed = request.config.getoption("--testbed") yield current_testbed +@pytest.fixture(scope="session") +def selected_port(request): + """yields the port option selection""" + current_port = request.config.getoption("--port") + yield current_port @pytest.fixture(scope="session") def num_stations(request): diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py index f6f7f1db7..70e4e020a 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py @@ -27,19 +27,19 @@ setup_params_general = { "vlan": 100 }]}, "rf": {}, - "radius": True + "radius": "DVLAN" } @allure.suite("regression") @allure.feature("VLAN MODE wpa2_enterprise Dynamic Vlan") @pytest.mark.parametrize( - 'setup_profiles', + 'setup_configuration', [setup_params_general], indirect=True, scope="class" ) -@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.usefixtures("setup_configuration") class TestDynamicVlanOverSsid5GWpa2(object): @pytest.mark.dynamic_precedence_over_ssid @@ -47,43 +47,56 @@ class TestDynamicVlanOverSsid5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_dynamic_precedence_over_ssid_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5705") - def test_dynamic_precedence_over_ssid_vlan_5g_wpa2(self, get_vif_state, lf_tools,get_ap_logs,get_lf_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_fiveg): + def test_dynamic_precedence_over_ssid_vlan_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "dynamic_precedence_over_ssid and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] mode = "VLAN" + band = "fiveg" vlan = [100,200] + ttls_passwd = "passwordB" #radius_info["password"] # + eap = "TTLS" + identity = "userB" #radius_info['user'] # + val = "" - upstream_port = lf_tools.upstream_port - print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=vlan) + # upstream_port = lf_tools.upstream_port + # print(upstream_port) + # port_resources = upstream_port.split(".") + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + # print(lf_tools.dut_idx_mapping) + # lf_tools.reset_scenario() + # for i in vlan: + get_test_library.add_vlan(vlan_ids=vlan) - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="fiveg", vlan_id=vlan[0], - station_name=station_names_fiveg, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordB", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True) - - eth_ssid_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + extra_securities=extra_secu, vlan_id=vlan, + mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, + identity=identity, num_sta=1, + dut_data=setup_configuration) + # get_test_library.enterprise_client_connectivity_test(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], + # mode=mode, band="fiveg", vlan_id=vlan[0], + # station_name=station_names_fiveg, key_mgmt="WPA-EAP", + # pairwise="NA", group="NA", wpa_psk="DEFAULT", + # ttls_passwd="passwordB", ieee80211w=0, + # wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True) + eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] - eth_radius_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_radius_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[1]))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_fiveg[0]].split('.') + sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_radius_vlan_ip.split('.') - print("station ip...", lf_test.station_ip[station_names_fiveg[0]]) + print("station ip...", sta_ip_1) print("vlan ip...", eth_radius_vlan_ip) print("eth_upstream_ip..", eth_ip) if sta_ip_1[0] == "0": @@ -99,7 +112,7 @@ class TestDynamicVlanOverSsid5GWpa2(object): else: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_fiveg[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip....", body=str(eth_ssid_vlan_ip)) allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan[1]))) diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa2.py index 507950495..a9fde423e 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa2.py @@ -35,12 +35,12 @@ setup_params_general = { @allure.suite("regression") @allure.feature("VLAN MODE wpa2_enterprise Dynamic Vlan") @pytest.mark.parametrize( - 'setup_profiles', + 'setup_configuration', [setup_params_general], indirect=True, scope="class" ) -@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.usefixtures("setup_configuration") class TestDynamicVlan5GWpa2(object): @pytest.mark.absence_of_radius_vlan_identifier @@ -48,42 +48,48 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_ssid_vlan_in_the_absence_of_radius_vlan_identifier", url="https://telecominfraproject.atlassian.net/browse/WIFI-5704") - def test_ssid_vlan_in_the_absence_of_radius_vlan_identifier_5g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs, - create_lanforge_chamberview_dut, lf_test, - get_configuration, - station_names_fiveg): + def test_ssid_vlan_in_the_absence_of_radius_vlan_identifier_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m " absence_of_radius_vlan_identifier and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] + band = "fiveg" mode = "VLAN" - vlan_id = 100 + vlan = 100 + ttls_passwd = "passwordvlannotsentuser" # radius_info["password"] # + eap = "TTLS" + identity = "vlannotsentuser" val = "" - upstream_port = lf_tools.upstream_port - print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan_id]) - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="fiveg", - station_name=station_names_fiveg, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordvlannotsentuser", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="vlannotsentuser", d_vlan=True) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) + + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + extra_securities=extra_secu, vlan_id=vlan, + mode=mode, band=band, eap=eap, d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, + identity=identity, num_sta=1, + dut_data=setup_configuration) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan_id))["interface"]["ip"] + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_fiveg[0]].split('.') - print(sta_ip_1) + sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_vlan_ip.split('.') - # eth_ip_1 = eth_ip.split('.') + print("station ip...", sta_ip_1) + print("ssid configured vlan ip...", eth_vlan_ip) + print("eth_upstream_ip..", eth_ip) if sta_ip_1[0] == "0": print("station didnt received any ip") allure.attach("station didnt recieved ip..") @@ -91,16 +97,13 @@ class TestDynamicVlan5GWpa2(object): elif eth_vlan_ip[0] == "0": print("ssid configured vlan didnt recieved ip") assert False - print("station ip...", lf_test.station_ip[station_names_fiveg[0]]) - print("upstream ip...", eth_ip) - print("ssid configured vlan ip", eth_vlan_ip) for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): if i != j: val = False elif i == j: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_fiveg[0]])) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan_id))) + allure.attach(name="station ip....", body=str(station_ip)) + allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -116,38 +119,41 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_dynamic_invalid_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5706") - def test_dynamic_invalid_vlan_5g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_fiveg): + def test_dynamic_invalid_vlan_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "invalidradiusvlan and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] + band = "fiveg" mode = "VLAN" - vlan_id = 100 + vlan = 100 + ttls_passwd = "passwordinvalidvlanuser" + eap = "TTLS" + identity = "invalidvlanuser" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan_id]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="fiveg", vlan_id=vlan_id, - station_name=station_names_fiveg, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordinvalidvlanuser", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="invalidvlanuser", d_vlan=True) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid = ssid_name, + security = security, extra_securities = extra_secu, vlan_id = vlan, + mode = mode, band = band, eap = eap, d_vlan = True, ttls_passwd = ttls_passwd, + ieee80211w = 0, identity = identity, num_sta = 1, dut_data = setup_configuration) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan_id))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_fiveg[0]].split('.') + sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_vlan_ip.split('.') if sta_ip_1[0] == "0": print("station didnt received any ip") @@ -156,7 +162,7 @@ class TestDynamicVlan5GWpa2(object): elif eth_vlan_ip[0] == "0": print("ssid configured vlan didnt recieved ip") assert False - print("station ip...", lf_test.station_ip[station_names_fiveg[0]]) + print("station ip...", station_ip) print("ssid vlan ip...", eth_vlan_ip) print("upstream ip..", eth_ip) for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): @@ -164,8 +170,8 @@ class TestDynamicVlan5GWpa2(object): val = False else: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_fiveg[0]])) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan_id))) + allure.attach(name="station ip....", body=str(station_ip)) + allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -181,47 +187,53 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_radius_vlan_info_retained_after_periodic_reauthentication", url="https://telecominfraproject.atlassian.net/browse/WIFI-5707") - def test_radius_vlan_info_retained_after_periodic_reauthentication_5g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, - get_ap_logs, - create_lanforge_chamberview_dut, lf_test, - get_configuration, - station_names_fiveg): + def test_radius_vlan_info_retained_after_periodic_reauthentication_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "periodic_reauthentication and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] + band = "fiveg" mode = "VLAN" vlan = [100, 200] - upstream_port = lf_tools.upstream_port + ttls_passwd = "passwordB" + eap = "TTLS" + identity = "userB" + + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=vlan) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="fiveg", vlan_id=vlan[1], - station_name=station_names_fiveg, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordB", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True, cleanup=False) - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid = ssid_name, security = security, + extra_securities = extra_secu, vlan_id = vlan, + mode = mode, band = band, eap = eap, d_vlan = True, + ttls_passwd = ttls_passwd, ieee80211w = 0, + identity = identity, num_sta = 1, + dut_data = setup_configuration, cleanup=False) + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip = lf_test.station_ip[station_names_fiveg[0]] + # sta_ip = station_ip count = 0 - # print("station ip...", lf_test.station_ip[station_names_fiveg[0]]) + # print("station ip...", get_test_library.station_ip[station_names_fiveg[0]]) # print("vlan ip...", eth_vlan_ip) # print("eth_vlan_ip..", eth_ip) - eth_ssid_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] - eth_rad_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_rad_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[1]))["interface"]["ip"] eth_vlan_ip_1 = eth_rad_vlan_ip.split('.') - sta_ip_1 = sta_ip.split('.') + sta_ip_1 = station_ip.split('.') if sta_ip_1[0] == "0": print("station didnt received any ip") allure.attach("station didnt recieved ip..") @@ -240,10 +252,13 @@ class TestDynamicVlan5GWpa2(object): continue count = count + 1 time.sleep(30) - lf_tools.admin_up_down([station_names_fiveg[0]], option="up") + for u in get_test_library.json_get("/port/?fields=port+type,alias")['interfaces']: + if list(u.values())[0]['port type'] not in ['Ethernet', 'WIFI-Radio', 'NA']: + station_name = (u.values())[0]['alias'] + get_test_library.admin_up_down([station_name], option="up") - sta_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + station_names_fiveg[0])["interface"]["ip"] + sta_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + "/" + station_name)["interface"]["ip"] sta_ip_1 = sta_ip.split('.') print(sta_ip) allure.attach(name="station ip....", body=str(sta_ip)) @@ -265,40 +280,43 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_ssid_vlan_used_in_absence_of_radius_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5708") - def test_ssid_vlan_used_in_absence_of_radius_vlan_5g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_fiveg): + def test_ssid_vlan_used_in_absence_of_radius_vlan_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "absenceofvlanid and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] + band = "fiveg" mode = "VLAN" vlan = 100 + ttls_passwd = "passwordvlannotsentuser" + eap = "TTLS" + identity = "vlannotsentuser" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="fiveg", vlan_id=vlan, - station_name=station_names_fiveg, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordvlannotsentuser", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="vlannotsentuser", d_vlan=True) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap, + d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, + num_sta=1, dut_data=setup_configuration) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_fiveg[0]].split('.') + sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_vlan_ip.split('.') - print("station ip...", lf_test.station_ip[station_names_fiveg[0]]) + print("station ip...", station_ip) print("ssid configured vlan ip...", eth_vlan_ip) print("upstream ip..", eth_ip) if sta_ip_1[0] == "0": @@ -314,7 +332,7 @@ class TestDynamicVlan5GWpa2(object): val = False else: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_fiveg[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) @@ -332,50 +350,50 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_dynamic_unsupported_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5710") - def test_dynamic_unsupported_vlan(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration, + def test_dynamic_unsupported_vlan(self, get_vif_state, get_test_library, + create_lanforge_chamberview_dut, get_test_library, get_configuration, station_names_fiveg): """ pytest -m "unsupported and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" vlan = 100 - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="fiveg", vlan_id=100, station_name=station_names_fiveg, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd="passwordinvalidvlanuser", ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity="invalidvlanuser", d_vlan=True) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_fiveg[0]].split('.') + sta_ip_1 = get_test_library.station_ip[station_names_fiveg[0]].split('.') eth_vlan_ip_1 = eth_ip.split('.') - print("station ip...", lf_test.station_ip[station_names_fiveg[0]]) + print("station ip...", get_test_library.station_ip[station_names_fiveg[0]]) print("vlan ip...", eth_vlan_ip) print("eth_vlan_ip..", eth_ip) for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): if i != j: - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_fiveg[0]])) + allure.attach(name="station ip....", body=str(get_test_library.station_ip[station_names_fiveg[0]])) allure.attach(name="vlan ip....", body=str(eth_vlan_ip)) print("Station ip not assigned as per vlan") assert False else: assert True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_fiveg[0]])) + allure.attach(name="station ip....", body=str(get_test_library.station_ip[station_names_fiveg[0]])) allure.attach(name="vlan ip....", body=str(eth_vlan_ip)) allure.attach(name="vlan ip....", body=str(eth_ip)) print("Station ip assigned as per vlan") @@ -386,40 +404,45 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_outof_bound_vlanid", url="https://telecominfraproject.atlassian.net/browse/WIFI-5711") - def test_out_of_bound_vlanid_5g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_fiveg): + def test_out_of_bound_vlanid_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "outofboundvlanid and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] + band = "fiveg" mode = "VLAN" vlan = 100 - upstream_port = lf_tools.upstream_port + ttls_passwd = "passwordoutofboundvlanuser" + eap = "TTLS" + identity = "outofboundvlanuser" + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="fiveg", vlan_id=vlan, - station_name=station_names_fiveg, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordoutofboundvlanuser", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="outofboundvlanuser", d_vlan=True) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + extra_securities=extra_secu, vlan_id=vlan, + mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, + identity=identity, num_sta=1, + dut_data=setup_configuration) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - if lf_test.station_ip[station_names_fiveg[0]] == "0.0.0.0": - print("station ip...", lf_test.station_ip[station_names_fiveg[0]]) + if station_ip == "0.0.0.0": + print("station ip...", station_ip) assert True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_fiveg[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) @@ -432,43 +455,48 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_client_association_ap_with_dynamic_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5712") - def test_client_association_ap_with_dynamic_vlan_5g_wpa2(self, get_vif_state, lf_tools, get_ap_logs, get_lf_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_fiveg): + def test_client_association_ap_with_dynamic_vlan_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "client_association_ap_with_dynamic_vlan and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] + band = "fiveg" mode = "VLAN" vlan = [100, 200] + ttls_passwd = "passwordB" + eap = "TTLS" + identity = "userB" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=vlan) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="fiveg", vlan_id=vlan[0], - station_name=station_names_fiveg, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordB", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + extra_securities=extra_secu, vlan_id=vlan, + mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, + identity=identity, num_sta=1, + dut_data=setup_configuration) - eth_ssid_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] - eth_radius_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_radius_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[1]))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_fiveg[0]].split('.') + sta_ip_1 = get_test_library.station_ip.split('.') eth_radius_vlan_ip_1 = eth_radius_vlan_ip.split('.') - print("station ip...", lf_test.station_ip[station_names_fiveg[0]]) + print("station ip...", station_ip) print("radius vlan ip...", eth_radius_vlan_ip) print("eth_upstream_ip..", eth_ip) if sta_ip_1[0] == "0": @@ -484,7 +512,7 @@ class TestDynamicVlan5GWpa2(object): val = False else: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_fiveg[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip....", body=str(eth_ssid_vlan_ip)) allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan[1]))) @@ -502,52 +530,55 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_subsequent_user_for_same_user_account", url="https://telecominfraproject.atlassian.net/browse/WIFI-5713") - def test_subsequent_user_for_same_user_account_5g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, - get_ap_logs, - create_lanforge_chamberview_dut, lf_test, - get_configuration, - station_names_fiveg): + def test_subsequent_user_for_same_user_account_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "subsequent_user_for_same_user_account and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] + band = "fiveg" mode = "VLAN" vlan = 100 + ttls_passwd = "passwordA" + eap = "TTLS" + identity = "userA" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) station_list = [] sta_ip = [] for i in range(0, 2): - station_list.append(lf_tools.fiveg_prefix + str(i)) + station_list.append(get_test_library.fiveg_prefix + str(i)) print(station_list) print([station_list[0]]) for m in range(0, len(station_list)): - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="fiveg", vlan_id=100, - station_name=[station_list[m]], key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordA", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="userA", d_vlan=True, cleanup=False) - lf_tools.admin_up_down([station_list[m]], option="up") - sta_ip.append(lf_test.station_ip[station_list[m]]) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + extra_securities=extra_secu, vlan_id=vlan, + mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, + identity=identity, num_sta=1, + dut_data=setup_configuration, cleanup=False) + get_test_library.admin_up_down([station_list[m]], option="up") + sta_ip.append(get_test_library.station_ip[station_list[m]]) if sta_ip[m] == "0.0.0.0": - allure.attach("station didnt recieved ip..") + allure.attach("station didn't recieved ip..") assert False print(sta_ip) time.sleep(30) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] eth_vlan_ip_1 = eth_vlan_ip.split('.') for n in range(0, len(station_list)): @@ -577,48 +608,51 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_subsequent_user_for_different_user_account_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5714") - def test_subsequent_user_for_different_user_account_5g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, - get_ap_logs, - create_lanforge_chamberview_dut, lf_test, - get_configuration, - station_names_fiveg): + def test_subsequent_user_for_different_user_account_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "subsequent_user_for_different_user_account and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] + security = "wpa2" + extra_secu = [] + band = "fiveg" mode = "VLAN" vlan = [100, 200] + ttls_passwd = "passwordA" + eap = "TTLS" + identity = "userA" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=vlan) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) station_list = [] sta_ip = [] dynamic_vlan_user = ["userA", "userB"] dynamic_vlan_pass = ["passwordA", "passwordB"] for i in range(0, 2): - station_list.append(lf_tools.fiveg_prefix + str(i)) + station_list.append(get_test_library.fiveg_prefix + str(i)) for user_id, user_pass, sta in zip(dynamic_vlan_user, dynamic_vlan_pass, range(0, len(station_list))): - lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="fiveg", vlan_id=vlan[sta], station_name=[station_list[sta]], key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd=user_pass, ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity=user_id, d_vlan=True, cleanup=False) - sta_ip.append(lf_test.station_ip[station_list[sta]]) + sta_ip.append(get_test_library.station_ip[station_list[sta]]) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[sta]))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] eth_vlan_ip_1 = eth_vlan_ip.split('.') print(sta_ip) @@ -626,7 +660,7 @@ class TestDynamicVlan5GWpa2(object): if sta_ip_1 == "0.0.0.0": allure.attach("station didn't received ip..") assert False - print("station ip...", lf_test.station_ip[station_list[sta]]) + print("station ip...", get_test_library.station_ip[station_list[sta]]) print("vlan ip...", eth_vlan_ip) print("eth_vlan_ip..", eth_ip) for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): @@ -645,6 +679,6 @@ class TestDynamicVlan5GWpa2(object): elif not val: print(f"{station_list[sta]} ip not assigned as per radius vlan") assert False - lf_tools.admin_up_down([station_list[sta]], option="up") + get_test_library.admin_up_down([station_list[sta]], option="up") time.sleep(5) diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py index b35293768..41662a0da 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py @@ -47,43 +47,47 @@ class TestDynamicVlanOverSsid2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_dynamic_precedence_over_ssid_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5705") - def test_dynamic_precedence_over_ssid_vlan_2g_wpa2(self, get_vif_state, lf_tools,get_ap_logs,get_lf_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_twog): + def test_dynamic_precedence_over_ssid_vlan_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "dynamic_precedence_over_ssid and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" + security = "wpa2" + extra_secu = [] + band = "twog" vlan = [100,200] + ttls_passwd = "passwordB" + eap = "TTLS" + identity = "userB" + val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=vlan) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="twog", vlan_id=vlan[0], - station_name=station_names_twog, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordB", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True) + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, security=security, extra_securities=extra_secu, + vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, + identity=identity, num_sta=1, dut_data=setup_configuration) - eth_ssid_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] - eth_radius_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_radius_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[1]))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_twog[0]].split('.') + sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_radius_vlan_ip.split('.') - print("station ip...", lf_test.station_ip[station_names_twog[0]]) + print("station ip...", station_ip) print("vlan ip...", eth_radius_vlan_ip) print("eth_upstream_ip..", eth_ip) if sta_ip_1[0] == "0": @@ -99,7 +103,7 @@ class TestDynamicVlanOverSsid2GWpa2(object): else: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_twog[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip....", body=str(eth_ssid_vlan_ip)) allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan[1]))) diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_vlan_twog_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_vlan_twog_wpa2.py index 78edd2f1d..110600758 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_vlan_twog_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_vlan_twog_wpa2.py @@ -48,39 +48,42 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_ssid_vlan_in_the_absence_of_radius_vlan_identifier", url="https://telecominfraproject.atlassian.net/browse/WIFI-5704") - def test_ssid_vlan_in_the_absence_of_radius_vlan_identifier_2g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs, - create_lanforge_chamberview_dut, lf_test, - get_configuration, - station_names_twog): + def test_ssid_vlan_in_the_absence_of_radius_vlan_identifier_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m " absence_of_radius_vlan_identifier and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" - vlan_id = 100 + security = "wpa2" + extra_secu = [] + band = "twog" + vlan = 100 + ttls_passwd = "passwordvlannotsentuser" + eap = "TTLS" + identity = "vlannotsentuser" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan_id]) - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="twog", - station_name=station_names_twog, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordvlannotsentuser", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="vlannotsentuser", d_vlan=True) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) + passes, result, station_ip = passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, + security=security, extra_securities=extra_secu, + vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, + num_sta=1, dut_data=setup_configuration) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan_id))["interface"]["ip"] + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_twog[0]].split('.') + sta_ip_1 = station_ip.split('.') print(sta_ip_1) eth_vlan_ip_1 = eth_vlan_ip.split('.') # eth_ip_1 = eth_ip.split('.') @@ -91,7 +94,7 @@ class TestDynamicVlan2GWpa2(object): elif eth_vlan_ip[0] == "0": print("ssid configured vlan didnt recieved ip") assert False - print("station ip...", lf_test.station_ip[station_names_twog[0]]) + print("station ip...", station_ip) print("upstream ip...", eth_ip) print("ssid configured vlan ip", eth_vlan_ip) for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): @@ -99,8 +102,8 @@ class TestDynamicVlan2GWpa2(object): val = False elif i == j: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_twog[0]])) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan_id))) + allure.attach(name="station ip....", body=str(station_ip)) + allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -116,47 +119,52 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_dynamic_invalid_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5706") - def test_dynamic_invalid_vlan_2g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_twog): + def test_dynamic_invalid_vlan_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "invalidradiusvlan and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" + security = "wpa2" + extra_secu = [] + band = "twog" vlan_id = 100 + ttls_passwd = "passwordinvalidvlanuser" + eap = "TTLS" + identity = "invalidvlanuser" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan_id]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan_id]) - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=vlan_id, station_name=station_names_twog, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd="passwordinvalidvlanuser", ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity="invalidvlanuser", d_vlan=True) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan_id))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_twog[0]].split('.') + sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_vlan_ip.split('.') if sta_ip_1[0] == "0": print("station didnt received any ip") - allure.attach("station didnt recieved ip..") + allure.attach("station didn't recieved ip..") assert False elif eth_vlan_ip[0] == "0": print("ssid configured vlan didnt recieved ip") assert False - print("station ip...", lf_test.station_ip[station_names_twog[0]]) + print("station ip...", station_ip) print("ssid vlan ip...", eth_vlan_ip) print("upstream ip..", eth_ip) for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): @@ -164,7 +172,7 @@ class TestDynamicVlan2GWpa2(object): val = False else: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_twog[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan_id))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) @@ -181,44 +189,47 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_radius_vlan_info_retained_after_periodic_reauthentication", url="https://telecominfraproject.atlassian.net/browse/WIFI-5707") - def test_radius_vlan_info_retained_after_periodic_reauthentication_2g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, - get_ap_logs, - create_lanforge_chamberview_dut, lf_test, - get_configuration, - station_names_twog): + def test_radius_vlan_info_retained_after_periodic_reauthentication_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "periodic_reauthentication and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" + security = "wpa2" + extra_secu = [] + band = "twog" vlan = [100, 200] - upstream_port = lf_tools.upstream_port + ttls_passwd = "passwordB" + eap = "TTLS" + identity = "userB" + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=vlan) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=vlan[1], station_name=station_names_twog, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd="passwordB", ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True, cleanup=False) - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip = lf_test.station_ip[station_names_twog[0]] + sta_ip = station_ip count = 0 - # print("station ip...", lf_test.station_ip[station_names_twog[0]]) + # print("station ip...", station_ip) # print("vlan ip...", eth_vlan_ip) # print("eth_vlan_ip..", eth_ip) - eth_ssid_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] - eth_rad_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_rad_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[1]))["interface"]["ip"] eth_vlan_ip_1 = eth_rad_vlan_ip.split('.') sta_ip_1 = sta_ip.split('.') @@ -240,9 +251,9 @@ class TestDynamicVlan2GWpa2(object): continue count = count + 1 time.sleep(30) - lf_tools.admin_up_down([station_names_twog[0]], option="up") + get_test_library.admin_up_down([station_names_twog[0]], option="up") - sta_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + sta_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + station_names_twog[0])["interface"]["ip"] sta_ip_1 = sta_ip.split('.') print(sta_ip) @@ -265,40 +276,45 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_ssid_vlan_used_in_absence_of_radius_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5708") - def test_ssid_vlan_used_in_absence_of_radius_vlan_2g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_twog): + def test_ssid_vlan_used_in_absence_of_radius_vlan_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "absenceofvlanid and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" + security = "wpa2" + extra_secu = [] + band = "twog" vlan = 100 + ttls_passwd = "passwordvlannotsentuser" + eap = "TTLS" + identity = "vlannotsentuser" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=vlan, station_name=station_names_twog, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd="passwordvlannotsentuser", ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity="vlannotsentuser", d_vlan=True) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_twog[0]].split('.') + sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_vlan_ip.split('.') - print("station ip...", lf_test.station_ip[station_names_twog[0]]) + print("station ip...", station_ip) print("ssid configured vlan ip...", eth_vlan_ip) print("upstream ip..", eth_ip) if sta_ip_1[0] == "0": @@ -314,7 +330,7 @@ class TestDynamicVlan2GWpa2(object): val = False else: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_twog[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) @@ -332,50 +348,50 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_dynamic_unsupported_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5710") - def test_dynamic_unsupported_vlan(self, get_vif_state, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration, + def test_dynamic_unsupported_vlan(self, get_vif_state, get_test_library, + create_lanforge_chamberview_dut, get_test_library, get_configuration, station_names_twog): """ pytest -m "unsupported and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" vlan = 100 - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=100, station_name=station_names_twog, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd="passwordinvalidvlanuser", ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity="invalidvlanuser", d_vlan=True) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_twog[0]].split('.') + sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_ip.split('.') - print("station ip...", lf_test.station_ip[station_names_twog[0]]) + print("station ip...", station_ip) print("vlan ip...", eth_vlan_ip) print("eth_vlan_ip..", eth_ip) for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): if i != j: - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_twog[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="vlan ip....", body=str(eth_vlan_ip)) print("Station ip not assigned as per vlan") assert False else: assert True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_twog[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="vlan ip....", body=str(eth_vlan_ip)) allure.attach(name="vlan ip....", body=str(eth_ip)) print("Station ip assigned as per vlan") @@ -386,40 +402,45 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_outof_bound_vlanid", url="https://telecominfraproject.atlassian.net/browse/WIFI-5711") - def test_out_of_bound_vlanid_2g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, get_ap_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_twog): + def test_out_of_bound_vlanid_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "outofboundvlanid and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" + security = "wpa2" + extra_secu = [] + band = "twog" vlan = 100 - upstream_port = lf_tools.upstream_port + ttls_passwd = "passwordoutofboundvlanuser" + eap = "TTLS" + identity = "outofboundvlanuser" + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=vlan, station_name=station_names_twog, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd="passwordoutofboundvlanuser", ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity="outofboundvlanuser", d_vlan=True) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - if lf_test.station_ip[station_names_twog[0]] == "0.0.0.0": - print("station ip...", lf_test.station_ip[station_names_twog[0]]) + if station_ip == "0.0.0.0": + print("station ip...", station_ip) assert True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_twog[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) @@ -432,43 +453,48 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_client_association_ap_with_dynamic_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5712") - def test_client_association_ap_with_dynamic_vlan_2g_wpa2(self, get_vif_state, lf_tools, get_ap_logs, get_lf_logs, - create_lanforge_chamberview_dut, lf_test, get_configuration, - station_names_twog): + def test_client_association_ap_with_dynamic_vlan_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "client_association_ap_with_dynamic_vlan and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" + security = "wpa2" + extra_secu = [] + band = "twog" vlan = [100, 200] + ttls_passwd = "passwordB" + eap = "TTLS" + identity = "userB" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=vlan) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=vlan[0], station_name=station_names_twog, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd="passwordB", ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True) - eth_ssid_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] - eth_radius_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_radius_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[1]))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] - sta_ip_1 = lf_test.station_ip[station_names_twog[0]].split('.') + sta_ip_1 = station_ip.split('.') eth_radius_vlan_ip_1 = eth_radius_vlan_ip.split('.') - print("station ip...", lf_test.station_ip[station_names_twog[0]]) + print("station ip...", station_ip) print("radius vlan ip...", eth_radius_vlan_ip) print("eth_upstream_ip..", eth_ip) if sta_ip_1[0] == "0": @@ -484,7 +510,7 @@ class TestDynamicVlan2GWpa2(object): val = False else: val = True - allure.attach(name="station ip....", body=str(lf_test.station_ip[station_names_twog[0]])) + allure.attach(name="station ip....", body=str(station_ip)) allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip....", body=str(eth_ssid_vlan_ip)) allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan[1]))) @@ -502,52 +528,55 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_subsequent_user_for_same_user_account", url="https://telecominfraproject.atlassian.net/browse/WIFI-5713") - def test_subsequent_user_for_same_user_account_2g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, - get_ap_logs, - create_lanforge_chamberview_dut, lf_test, - get_configuration, - station_names_twog): + def test_subsequent_user_for_same_user_account_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "subsequent_user_for_same_user_account and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" + security = "wpa2" + extra_secu = [] + band = "twog" vlan = 100 + ttls_passwd = "passwordA" + eap = "TTLS" + identity = "userA" val = "" - upstream_port = lf_tools.upstream_port + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=[vlan]) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=[vlan]) station_list = [] sta_ip = [] for i in range(0, 2): - station_list.append(lf_tools.twog_prefix + str(i)) + station_list.append(get_test_library.twog_prefix + str(i)) print(station_list) print([station_list[0]]) for m in range(0, len(station_list)): - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=100, station_name=[station_list[m]], key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd="passwordA", ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity="userA", d_vlan=True, cleanup=False) - lf_tools.admin_up_down([station_list[m]], option="up") - sta_ip.append(lf_test.station_ip[station_list[m]]) + get_test_library.admin_up_down([station_list[m]], option="up") + sta_ip.append(get_test_library.station_ip[station_list[m]]) if sta_ip[m] == "0.0.0.0": allure.attach("station didnt recieved ip..") assert False print(sta_ip) time.sleep(30) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] eth_vlan_ip_1 = eth_vlan_ip.split('.') for n in range(0, len(station_list)): @@ -577,48 +606,51 @@ class TestDynamicVlan2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_subsequent_user_for_different_user_account_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5714") - def test_subsequent_user_for_different_user_account_2g_wpa2(self, get_vif_state, lf_tools, get_lf_logs, - get_ap_logs, - create_lanforge_chamberview_dut, lf_test, - get_configuration, - station_names_twog): + def test_subsequent_user_for_different_user_account_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, + get_test_device_logs, num_stations, setup_configuration): """ pytest -m "subsequent_user_for_different_user_account and wpa2_enterprise and vlan" """ profile_data = setup_params_general["ssid_modes"]["wpa2_enterprise"] - ssid_2G = profile_data[0]["ssid_name"] + ssid_name = profile_data[0]["ssid_name"] mode = "VLAN" val = "" + security = "wpa2" + extra_secu = [] + band = "twog" vlan = [100, 200] - upstream_port = lf_tools.upstream_port + ttls_passwd = "passwordB" + eap = "TTLS" + identity = "userB" + upstream_port = get_test_library.upstream_port print(upstream_port) - port_resources = upstream_port.split(".") - print(lf_tools.dut_idx_mapping) - lf_tools.reset_scenario() - lf_tools.add_vlan(vlan_ids=vlan) + port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') + print(get_test_library.dut_idx_mapping) + get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) station_list = [] sta_ip = [] dynamic_vlan_user = ["userA", "userB"] dynamic_vlan_pass = ["passwordA", "passwordB"] for i in range(0, 2): - station_list.append(lf_tools.twog_prefix + str(i)) + station_list.append(get_test_library.twog_prefix + str(i)) for user_id, user_pass, sta in zip(dynamic_vlan_user, dynamic_vlan_pass, range(0, len(station_list))): - lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=vlan[sta], station_name=[station_list[sta]], key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", ttls_passwd=user_pass, ieee80211w=0, wep_key="NA", ca_cert="NA", eap="TTLS", identity=user_id, d_vlan=True, cleanup=False) - sta_ip.append(lf_test.station_ip[station_list[sta]]) + sta_ip.append(station_ip) - eth_vlan_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[sta]))["interface"]["ip"] - eth_ip = lf_tools.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + + eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] eth_vlan_ip_1 = eth_vlan_ip.split('.') print(sta_ip) @@ -626,7 +658,7 @@ class TestDynamicVlan2GWpa2(object): if sta_ip_1 == "0.0.0.0": allure.attach("station didn't received ip..") assert False - print("station ip...", lf_test.station_ip[station_list[sta]]) + print("station ip...", station_ip) print("vlan ip...", eth_vlan_ip) print("eth_vlan_ip..", eth_ip) for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): @@ -645,6 +677,6 @@ class TestDynamicVlan2GWpa2(object): elif not val: print(f"{station_list[sta]} ip not assigned as per radius vlan") assert False - lf_tools.admin_up_down([station_list[sta]], option="up") + get_test_library.admin_up_down([station_list[sta]], option="up") time.sleep(5) diff --git a/tests/lab_info.json b/tests/lab_info.json deleted file mode 100644 index 038f4ae21..000000000 --- a/tests/lab_info.json +++ /dev/null @@ -1,1431 +0,0 @@ - - { - -"CONFIGURATION" : { - "basic-shivam" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "edgecore_eap101", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth3", - "lan_port": null, - "ssid": { - "mode": "BRIDGE", - "ssid_data": { - "0": { - "ssid": "ssid_wpa2_2g", - "encryption": "wpa2", - "password": "something", - "band": "fiveg", - "bssid": "90:3C:B3:6C:43:05" - }, - "1": { - "ssid": "ssid_wpa2_2g", - "encryption": "wpa2", - "password": "something", - "band": "twog", - "bssid": "90:3C:B3:6C:43:04" - } - }, - "radio_data": { - "2G": { - "channel": 1, - "bandwidth": 20, - "frequency": 2412 - }, - "5G": { - "channel": 52, - "bandwidth": 80, - "frequency": 5290 - }, - "6G": { - "channel": null, - "bandwidth": null, - "frequency": null - } - } - }, - "mode": "wifi6", - "identifier": "903cb36c4301", - "method": "serial", - "host_ip": "192.168.52.89", - "host_username": "lanforge", - "host_password": "lanforge", - "host_ssh_port": 22 , - "serial_tty": "/dev/ttyUSB0", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "192.168.52.89", - "http_port": 8080 , - "ssh_port": 22 , - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth3": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth2": { - "addressing": "static", - "ip": "192.168.52.150", - "gateway_ip": "192.168.52.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-01" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "wallys_dr40x9", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi5", - "identifier": "c44bd1005b30", - "method": "serial", - "host_ip": "10.28.3.100", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22 , - "serial_tty": "/dev/ttyAP8", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.6", - "http_port": 8080 , - "ssh_port": 22 , - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.6", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-02" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "hfcl_ion4", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi5", - "identifier": "0006aee53b84", - "method": "serial", - "host_ip": "10.28.3.100", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22 , - "serial_tty": "/dev/ttyAP2", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.8", - "http_port": 8080 , - "ssh_port": 22 , - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.7", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-03" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "tp-link_ec420-g1", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": "1.1.eth1", - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi5", - "identifier": "001122090801", - "method": "serial", - "host_ip": "10.28.3.100", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 8821, - "serial_tty": "/dev/ttyAP3", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "localhost", - "http_port": 8820 , - "ssh_port": 8821 , - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - "1.1.eth1" : { - "addressing": "dynamic" - } - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.8", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-03a" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "indio_um-305ac", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": "1.1.eth1", - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi5", - "identifier": "706dec0a8a79", - "method": "serial", - "host_ip": "10.28.3.100", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 8822, - "serial_tty": "/dev/ttyAP6", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "localhost", - "http_port": 8820, - "ssh_port": 8821, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - "1.1.eth1" : { - "addressing": "dynamic" - } - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.8", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-04" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "edgecore_ecw5211", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": "1.1.eth1", - "ssid": { - "mode": "BRIDGE", - "ssid_modes": { - "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_5g_36", - "band": "5G", - "bssid": "aaaaa", - "security_key": "something"}]}, - "rf": { - "5G": { - "channel-width": 80, - "channel": 36 - } - } - }, - "mode": "wifi5", - "identifier": "68215fda456d", - "method": "serial", - "host_ip": "10.28.3.100", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22 , - "serial_tty": "/dev/ttyAP5", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.12", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - "1.1.eth1" : { - "addressing": "dynamic" - } - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.9", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-04a" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "hfcl_ion4xi", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": "1.1.eth1", - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi5", - "identifier": "0006ae6df11f", - "method": "serial", - "host_ip": "10.28.3.100", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22 , - "serial_tty": "/dev/ttyAP5", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "localhost", - "http_port": 8830, - "ssh_port": 8831, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - "1.1.eth1" : { - "addressing": "dynamic" - } - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.9", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-05" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "cig_wf188n", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6", - "identifier": "0000c1018812", - "method": "serial", - "host_ip": "10.28.3.103", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP1", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.28", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth1": { - "addressing": "static", - "ip": "10.28.2.16", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-06" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "edgecore_eap102", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6", - "identifier": "903cb39d6918", - "method": "serial", - "host_ip": "10.28.3.103", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP2", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.30", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.17", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - - - "basic-07" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "edgecore_eap101", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6", - "identifier": "903cb36ae223", - "method": "serial", - "host_ip": "10.28.3.103", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP3", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.32", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.18", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "basic-08" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "cig_wf194c", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth2", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6", - "identifier": "00c115194c15", - "method": "serial", - "host_ip": "10.28.3.103", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP5", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.34", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.19", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "advance-02" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "edgecore_eap102", - "supported_bands": ["2G", "5G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth1", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6", - "identifier": "903cb39d6958", - "method": "serial", - "host_ip": "10.28.3.102", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP3", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.26", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth1": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.15", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "advance-03" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "cig_wf196", - "supported_bands": ["2G", "5G", "6G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.3.eth2", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6e", - "identifier": "824f816011e4", - "method": "serial", - "host_ip": "localhost", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 8902, - "serial_tty": "/dev/ttyAP0", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.117", - "http_port": 8900, - "ssh_port": 8901, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.3.eth2": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.3.eth3": { - "addressing": "static", - "ip": "10.28.2.39", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - "interop-01" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "edgecore_eap102", - "supported_bands": ["2G", "5G", "6G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth1", - "lan_port": null, - "ssid": {}, - "mode": "wifi6e", - "identifier": "903cb39d69c0", - "method": "serial", - "host_ip": "10.28.3.102", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP1", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.22", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth1": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.25", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - - "interop-02" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "edgecore_eap101", - "supported_bands": ["2G", "5G", "6G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth1", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6e", - "identifier": "903cb36ae4a3", - "method": "serial", - "host_ip": "10.28.3.102", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP4", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.22", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth1": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.25", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - - "interop-03" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "edgecore_eap101", - "supported_bands": ["2G", "5G", "6G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth1", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6e", - "identifier": "903cb36ae255", - "method": "serial", - "host_ip": "10.28.3.102", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP5", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.22", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth1": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.25", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - }, - - "interop-04" : { - "target": "tip_2x", - "controller" : { - "url": "https://sec-qa01.cicd.lab.wlan.tip.build:16001", - "username": "tip@ucentral.com", - "password": "OpenWifi%123" - }, - "device_under_tests": [{ - "model": "cig_wf194c4", - "supported_bands": ["2G", "5G", "6G"], - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "wan_port": "1.1.eth1", - "lan_port": null, - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "OpenWifi", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "OpenWifi", - "2g-encryption": "WPA2", - "5g-encryption": "WPA2", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6e", - "identifier": "f40b9fe78d3d", - "method": "serial", - "host_ip": "10.28.3.102", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP7", - "firmware_version": "next-latest" - }], - "traffic_generator": { - "name": "lanforge", - "testbed": "basic", - "scenario": "dhcp-bridge", - "details": { - "manager_ip": "10.28.3.22", - "http_port": 8080, - "ssh_port": 22, - "setup": {"method": "build", "DB": "Test_Scenario_Automation"}, - "wan_ports": { - "1.1.eth1": {"addressing": "dhcp-server", "subnet": "172.16.0.1/16", "dhcp": { - "lease-first": 10, - "lease-count": 10000, - "lease-time": "6h" - } - } - }, - "lan_ports": { - - }, - "uplink_nat_ports": { - "1.1.eth3": { - "addressing": "static", - "ip": "10.28.2.25", - "gateway_ip": "10.28.2.1/24", - "ip_mask": "255.255.255.0", - "dns_servers": "BLANK" - } - } - } - } - } - -}, - -"PERFECTO_DETAILS" : { - "securityToken":"eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJpYXQiOjE2MzI4Mzc2NDEsImp0aSI6IjAwZGRiYWY5LWQwYjMtNDRjNS1hYjVlLTkyNzFlNzc5ZGUzNiIsImlzcyI6Imh0dHBzOi8vYXV0aDIucGVyZmVjdG9tb2JpbGUuY29tL2F1dGgvcmVhbG1zL3RpcC1wZXJmZWN0b21vYmlsZS1jb20iLCJhdWQiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwic3ViIjoiODNkNjUxMWQtNTBmZS00ZWM5LThkNzAtYTA0ZjBkNTdiZDUyIiwidHlwIjoiT2ZmbGluZSIsImF6cCI6Im9mZmxpbmUtdG9rZW4tZ2VuZXJhdG9yIiwibm9uY2UiOiI2ZjE1YzYxNy01YTU5LTQyOWEtODc2Yi1jOTQxMTQ1ZDFkZTIiLCJzZXNzaW9uX3N0YXRlIjoiYmRjZTFmYTMtMjlkYi00MmFmLWI5YWMtYjZjZmJkMDEyOTFhIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.5R85_1R38ZFXv_wIjjCIsj8NJm1p66dCsLJI5DBEmks", - "projectName": "TIP-PyTest-Execution", - "projectVersion": "1.0", - "reportTags": "TestTag", - "perfectoURL":"tip", - "available_devices": [""], - "iPhone-11": { - "model-iOS": "iPhone-11", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-11", - "jobNumber": 38 - }, - "iPhone-12": { - "model-iOS": "iPhone-12", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-12", - "jobNumber": 38 - }, - "iPhone-7": { - "model-iOS": "iPhone-7", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-7", - "jobNumber": 38 - }, - "iPhone-XR": { - "model-iOS": "iPhone-XR", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-XR", - "jobNumber": 38 - }, - "Galaxy S20": { - "platformName-android": "Android", - "model-android": "Galaxy S20", - "appPackage-android": "com.android.settings", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "jobName": "Interop-Galaxy-S20", - "jobNumber": 38 - }, - "Galaxy S10.*": { - "platformName-android": "Android", - "model-android": "Galaxy S10.*", - "appPackage-android": "com.android.settings", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "jobName": "Interop-Galaxy-S10", - "jobNumber": 38 - }, - "Galaxy S9": { - "platformName-android": "Android", - "model-android": "Galaxy S9", - "appPackage-android": "com.android.settings", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "jobName": "Interop-Galaxy-S9", - "jobNumber": 38 - }, - "Pixel 4": { - "platformName-android": "Android", - "model-android": "Pixel 4", - "appPackage-android": "com.android.settings", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "jobName": "Interop-pixel-4", - "jobNumber": 38 - } -}, -"RADIUS_SERVER_DATA" : { - "ip": "10.28.3.100", - "port": 1812, - "secret": "testing123", - "user": "nolaradius", - "password": "nolastart", - "pk_password": "whatever" -}, - -"RADIUS_ACCOUNTING_DATA" : { - "ip": "10.10.1.221", - "port": 1813, - "secret": "testing123", - "user": "user", - "password": "password", - "pk_password": "whatever" -}, - -"DYNAMIC_VLAN_RADIUS_SERVER_DATA" : { - "ip": "3.20.165.131", - "port": 1812, - "secret": "testing123", - "user": "user", - "password": "password", - "pk_password": "whatever" -}, - -"DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA" : { - "ip": "3.20.165.131", - "port": 1813, - "secret": "testing123", - "user": "user", - "password": "password", - "pk_password": "whatever" -}, - -"RATE_LIMITING_RADIUS_SERVER_DATA" : { - "ip": "18.189.85.200", - "port": 1812, - "secret": "testing123", - "user": "user", - "password": "password", - "pk_password": "whatever" -}, - -"RATE_LIMITING_RADIUS_ACCOUNTING_DATA" : { - "ip": "18.189.85.200", - "port": 1813, - "secret": "testing123", - "user": "user", - "password": "password", - "pk_password": "whatever" -}, - -"PASSPOINT_RADIUS_SERVER_DATA" : { - "ip": "52.234.179.191", - "port": 11812, - "secret": "yeababy20!", - "user": "nolaradius", - "password": "nolastart", - "pk_password": "whatever" -}, - -"PASSPOINT_RADIUS_ACCOUNTING_SERVER_DATA" : { - "ip": "52.234.179.191", - "port": 11813, - "secret": "yeababy20!" -}, - -"PASSPOINT_PROVIDER_INFO" : { - "mcc": null, - "mnc": null, - "network": null, - "nai_realms": { - "domain": "oss.ameriband.com", - "encoding": 0, - "eap_map": {"EAP-TTLS with username/password": ["Credential Type:username/password", - "Non-EAP Inner Authentication Type:MSCHAPV2"]} - }, - "osu_nai_standalone": "anonymous@ameriband.com", - "osu_nai_shared": "anonymous@ameriband.com", - "roaming_oi": [] -}, - -"PASSPOINT_OPERATOR_INFO" : { - "osen": "Disabled", - "domain_name_list": ["telecominfraproject.atlassian.net"], - "operator_names": [ - {"locale": "eng", "name": "Default friendly passpoint_operator name"}, - {"locale": "fra", "name": "Nom de lopérateur convivial par défaut"} - ] -}, - -"PASSPOINT_VENUE_INFO" : { - "venue_type": {"group": "Business", "type": "Police Station"}, - "venue_names": [ - {"locale": "eng", "name": "Example passpoint_venue", "url": "http://www.example.com/info-eng"}, - {"locale": "fra", "name": "Exemple de lieu", "url": "http://www.example.com/info-fra"} - ] -}, - -"PASSPOINT_PROFILE_INFO" : { - "profile_download_url_ios": "https://onboard.almondlabs.net/ttls/AmeriBand-Profile.mobileconfig", - "profile_download_url_android": "https://onboard.almondlabs.net/ttls/androidconfig.cfg", - "profile_name_on_device": "AmeriBand", - "radius_configuration": { - "user_defined_nas_id": "FB001AP001", - "operator_id": "AmeribandTIP", - "radius_acounting_service_interval": 60 - }, - "interworking_hs2dot0": "Enabled", - "hessid": null, - "access_network": { - "Access Network Type": "Free Public Network", - "Authentication Type": "Acceptance of Terms & Conditions", - "Emergency Services Reachable": "Enabled", - "Unauthenticated Emergency Service": "Disabled" - }, - "ip_connectivity": { - "Internet Connectivity": "Enabled", - "IP Address Type": "Public IPv4 Address Available", - "Connection Capability": [{"status": "open", "protocol": "TCP", "port": 8888}], - "ANQP Domain ID": 1234, - "GAS Address 3 Behaviour": "P2P Spec Workaround From Request", - "Disable DGAF": false - } -}, -"open_flow":{}, - -"influx_params" : {} - -} From 4ebb26b09c8b7c54e8033cef7aa56e0be9bd407e Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Wed, 19 Oct 2022 20:20:08 +0530 Subject: [PATCH 2/4] Added check_connectivity Signed-off-by: jitendracandela --- .../test_peak_throughput_wpa2_40Mhz_2g.py | 2 +- .../test_peak_throughput_wpa2_80Mhz_5g.py | 2 +- .../multi_psk/wpa2_security/test_multipsk_basic_wpa2.py | 4 ++-- .../multi_psk/wpa_security/test_multipsk_basic_wpa.py | 4 ++-- .../bridge_mode/rate_limiting/test_rate_limiting.py | 2 +- .../rate_limiting_with_radius/test_radius_limiting.py | 4 ++-- .../multi_psk/wpa2_security/test_multipsk_basic_wpa2.py | 4 ++-- .../multi_psk/wpa_security/test_multipsk_basic_wpa.py | 4 ++-- .../nat_mode/rate_limiting/test_rate_limiting.py | 2 +- .../vlan_mode/multi_vlan/test_multi_vlan_fiveg.py | 6 +++--- .../vlan_mode/multi_vlan/test_multi_vlan_twog.py | 6 +++--- .../vlan_mode/rate_limiting/test_rate_limiting.py | 3 ++- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py index 1eab201f6..40185a006 100644 --- a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py +++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py @@ -1369,7 +1369,7 @@ class Test20Mhz2GChannel11PeakThroughput(object): @allure.title("Single client TCP Download wifi capacity 40Mhz Bw") @allure.sub_suite("BRIDGE Mode") def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): profile_data = {"ssid_name": "ssid_wpa2_personal_2g_11", "appliedRadios": ["2G"], "security_key": "something"} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" diff --git a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py index 55b4cc175..a09b04673 100644 --- a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py +++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py @@ -49,7 +49,7 @@ class Test80Mhz5GChannel36PeakThroughput(object): @allure.title("Single client TCP Download wifi capacity 80Mhz Bw") @allure.sub_suite("BRIDGE Mode") def test_client_wpa2_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): profile_data = {"ssid_name": "ssid_wpa2_5g_36", "appliedRadios": ["5G"], "security_key": "something"} ssid_name = profile_data["ssid_name"] mode = "BRIDGE" diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/multi_psk/wpa2_security/test_multipsk_basic_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/multi_psk/wpa2_security/test_multipsk_basic_wpa2.py index 06ad06b90..17d7a4891 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/multi_psk/wpa2_security/test_multipsk_basic_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/multi_psk/wpa2_security/test_multipsk_basic_wpa2.py @@ -55,7 +55,7 @@ class TestMultipskBridgeWPA2(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3493", name="WIFI-3493") @allure.title("Test for Client Connect with 1 VLAN") def test_client_wpa2_2g_vlan1(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ BRIDGE Mode Multipsk Test with wpa encryption 2.4 GHz Band pytest -m "multi_psk_tests and bridge and wpa_personal and vlan1 and twog" @@ -93,7 +93,7 @@ class TestMultipskBridgeWPA2(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3493", name="WIFI-3493") @allure.title("Test for Client Connect with 2 VLAN's") def test_client_wpa2_2g_vlan2(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ BRIDGE Mode Multipsk Test with wpa encryption 2.4 GHz Band pytest -m "multi_psk_tests and bridge and wpa2_personal and vlan2 and twog" diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/multi_psk/wpa_security/test_multipsk_basic_wpa.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/multi_psk/wpa_security/test_multipsk_basic_wpa.py index aad28551c..48f4e60a5 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/multi_psk/wpa_security/test_multipsk_basic_wpa.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/multi_psk/wpa_security/test_multipsk_basic_wpa.py @@ -55,7 +55,7 @@ class TestMultipskBridgeWPA(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3493", name="WIFI-3493") @allure.title("Test for Client Connect with 1 VLAN") def test_client_wpa_2g_vlan1(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ BRIDGE Mode Multipsk Test with wpa encryption 2.4 GHz Band pytest -m "multi_psk_tests and bridge and wpa_personal and vlan1 and twog" @@ -93,7 +93,7 @@ class TestMultipskBridgeWPA(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3493", name="WIFI-3493") @allure.title("Test for Client Connect with 2 VLAN's") def test_client_wpa_2g_vlan2(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ BRIDGE Mode Multipsk Test with wpa encryption 2.4 GHz Band pytest -m "multi_psk_tests and bridge and wpa and vlan2 and twog" diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py index 84ad2dd7f..c35f3ca81 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py @@ -114,7 +114,7 @@ class TestRateLimitingBridge(object): @pytest.mark.rate_limiting_tests @allure.title("Test for Upload and Download batch size 1,2,5 2.4 GHz") def test_wpa2_personal_ssid_up_dw_batch_size_125_2g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Test Rate Limiting Scenario pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and upload_download and batch_size_125" diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting_with_radius/test_radius_limiting.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting_with_radius/test_radius_limiting.py index a99414c0f..9e676e8b8 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting_with_radius/test_radius_limiting.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting_with_radius/test_radius_limiting.py @@ -67,7 +67,7 @@ class TestRateLimitingWithRadiusBridge(object): get_test_device_logs, get_target_object, num_stations, setup_configuration, rate_radius_info, - rate_radius_accounting_info): + rate_radius_accounting_info, check_connectivity): profile_data = {"ssid_name": "ssid_wpa2_2g_br", "appliedRadios": ["2G"], "security_key": "something", @@ -112,7 +112,7 @@ class TestRateLimitingWithRadiusBridge(object): get_test_device_logs, get_target_object, num_stations, setup_configuration, rate_radius_info, - rate_radius_accounting_info): + rate_radius_accounting_info, check_connectivity): profile_data = {"ssid_name": "ssid_wpa2_2g_br", "appliedRadios": ["2G"], "security_key": "something", diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/multi_psk/wpa2_security/test_multipsk_basic_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/multi_psk/wpa2_security/test_multipsk_basic_wpa2.py index e271a7fb2..29e99fafe 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/multi_psk/wpa2_security/test_multipsk_basic_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/multi_psk/wpa2_security/test_multipsk_basic_wpa2.py @@ -55,7 +55,7 @@ class TestMultipskNAT(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3493", name="WIFI-3493") @allure.title("Test for Client Connect with 1 VLAN") def test_client_wpa2_2g_vlan1(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ NAT Mode Multipsk Test with wpa encryption 2.4 GHz Band pytest -m "multi_psk_tests and NAT and wpa_personal and vlan1 and twog" @@ -93,7 +93,7 @@ class TestMultipskNAT(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3493", name="WIFI-3493") @allure.title("Test for Client Connect with 2 VLAN's") def test_client_wpa2_2g_vlan2(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ nat Mode Multipsk Test with wpa encryption 2.4 GHz Band pytest -m "multi_psk_tests and nat and wpa2_personal and vlan2 and twog" diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/multi_psk/wpa_security/test_multipsk_basic_wpa.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/multi_psk/wpa_security/test_multipsk_basic_wpa.py index 11a017290..87bae6f63 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/multi_psk/wpa_security/test_multipsk_basic_wpa.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/multi_psk/wpa_security/test_multipsk_basic_wpa.py @@ -55,7 +55,7 @@ class TestMultipskNAT(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3493", name="WIFI-3493") @allure.title("Test for Client Connect with 1 VLAN") def test_client_wpa_2g_vlan1(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ NAT Mode Multipsk Test with wpa encryption 2.4 GHz Band pytest -m "multi_psk_tests and NAT and wpa_personal and vlan1 and twog" @@ -93,7 +93,7 @@ class TestMultipskNAT(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3493", name="WIFI-3493") @allure.title("Test for Client Connect with 2 VLAN's") def test_client_wpa_2g_vlan2(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ NAT Mode Multipsk Test with wpa encryption 2.4 GHz Band pytest -m "multi_psk_tests and NAT and wpa and vlan2 and twog" diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py index aa1f986b7..2c9485313 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py @@ -114,7 +114,7 @@ class TestRateLimitingNAT(object): @pytest.mark.rate_limiting_tests @allure.title("Test for Upload and Download batch size 1,2,5 2.4 GHz") def test_wpa2_personal_ssid_up_dw_batch_size_125_2g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Test Rate Limiting Scenario pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and upload_download and batch_size_125" diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/multi_vlan/test_multi_vlan_fiveg.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/multi_vlan/test_multi_vlan_fiveg.py index 455277257..2aa79cd86 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/multi_vlan/test_multi_vlan_fiveg.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/multi_vlan/test_multi_vlan_fiveg.py @@ -74,7 +74,7 @@ class TestMultiVlan(object): url="https://telecominfraproject.atlassian.net/browse/WIFI-2169") @allure.title("Test VLAN with WPA Security Mode") def test_multi_vlan_wpa_5g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Multi VLAN Test with open encryption 2.4 GHz Band pytest -m "multi_vlan_tests and open and fiveg" @@ -101,7 +101,7 @@ class TestMultiVlan(object): url="https://telecominfraproject.atlassian.net/browse/WIFI-2157") @allure.title("Test VLAN with WPA2 Personal Security Mode") def test_multi_vlan_wpa2_personal_5g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Multi VLAN Test with open encryption 2.4 GHz Band pytest -m "multi_vlan_tests and open and fiveg" @@ -154,7 +154,7 @@ class TestMultiVlan(object): url="https://telecominfraproject.atlassian.net/browse/WIFI-2174") @allure.title("Test Disabled VLAN with WPA2 Security Mode") def test_disable_vlan_wpa2_5g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Client connectivity using vlan, wpa2, fiveg pytest -m disable_vlan_fiveg diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/multi_vlan/test_multi_vlan_twog.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/multi_vlan/test_multi_vlan_twog.py index 705cadeb7..c1796baa1 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/multi_vlan/test_multi_vlan_twog.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/multi_vlan/test_multi_vlan_twog.py @@ -75,7 +75,7 @@ class TestMultiVlan(object): url="https://telecominfraproject.atlassian.net/browse/WIFI-2168") @allure.title("Test VLAN with WPA Security Mode") def test_multi_vlan_wpa_2g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Multi VLAN Test with open encryption 2.4 GHz Band pytest -m "multi_vlan_tests and open and twog" @@ -102,7 +102,7 @@ class TestMultiVlan(object): url="https://telecominfraproject.atlassian.net/browse/WIFI-2156") @allure.title("Test VLAN with WPA2 Personal Security Mode") def test_multi_vlan_wpa2_personal_2g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Multi VLAN Test with open encryption 2.4 GHz Band pytest -m "multi_vlan_tests and open and twog" @@ -155,7 +155,7 @@ class TestMultiVlan(object): url="https://telecominfraproject.atlassian.net/browse/WIFI-2174") @allure.title("Test Disabled VLAN with WPA2 Security Mode") def test_disable_vlan_wpa2_2g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, check_connectivity): """ Client connectivity using vlan, wpa2, fiveg pytest -m disable_vlan_fiveg diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py index 6f0bed4db..0548dec27 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py @@ -119,7 +119,8 @@ class TestRateLimitingVLAN(object): @pytest.mark.rate_limiting_tests @allure.title("Test for Upload and Download batch size 1,2,5 2.4 GHz") def test_wpa2_personal_ssid_up_dw_batch_size_125_2g(self, get_test_library, get_dut_logs_per_test_case, - get_test_device_logs, num_stations, setup_configuration): + get_test_device_logs, num_stations, setup_configuration, + check_connectivity): """ Test Rate Limiting Scenario pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and upload_download and batch_size_125" From 5ef73b36fee04371f92e99974312a1f56eaf7165 Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Wed, 19 Oct 2022 23:54:27 +0530 Subject: [PATCH 3/4] Added ow_sanity_lf marker Signed-off-by: jitendracandela --- tests/test_connectivity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_connectivity.py b/tests/test_connectivity.py index 9ee03efbe..cdf9016f0 100644 --- a/tests/test_connectivity.py +++ b/tests/test_connectivity.py @@ -11,6 +11,7 @@ import json pytestmark = [pytest.mark.test_resources, pytest.mark.sanity, + pytest.mark.ow_sanity_lf, pytest.mark.uc_sanity, pytest.mark.sanity_55, pytest.mark.interop_uc_sanity, @@ -186,7 +187,6 @@ class TestResources(object): @pytest.mark.traffic_generator_connectivity - @pytest.mark.jitu @allure.testcase(name="test_traffic_generator_connectivity", url="") def test_traffic_generator_connectivity(self, get_test_library): """Test case to verify Traffic Generator Connectivity""" From 6118dfd723adf4baa34291bf3789a11fb32399c7 Mon Sep 17 00:00:00 2001 From: karthikaeyetea Date: Thu, 20 Oct 2022 14:52:40 +0530 Subject: [PATCH 4/4] Refractored DVLAN Signed-off-by: karthikaeyetea --- .../test_dynamic_over_ssid_fiveg_wpa2.py | 70 +++---- .../fiveg/test_dynamic_vlan_fiveg_wpa2.py | 158 +++++++-------- .../twog/test_dynamic_over_ssid_twog_wpa2.py | 61 +++--- .../twog/test_dynamic_vlan_twog_wpa2.py | 188 ++++++++---------- 4 files changed, 212 insertions(+), 265 deletions(-) diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py index 70e4e020a..3571091bf 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py @@ -5,16 +5,18 @@ """ -import os import allure import pytest -from configuration import DYNAMIC_VLAN_RADIUS_SERVER_DATA -from configuration import DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA +import importlib +import logging -pytestmark = [pytest.mark.ow_regression_lf, - pytest.mark.ow_dvlan_tests_lf, - pytest.mark.wpa2_enterprise, - pytest.mark.fiveg] +lf_library = importlib.import_module("configuration") +DYNAMIC_VLAN_RADIUS_SERVER_DATA = lf_library.DYNAMIC_VLAN_RADIUS_SERVER_DATA +DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA = lf_library.DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA + +pytestmark = [pytest.mark.dynamic_vlan_tests, + pytest.mark.vlan, + pytest.mark.ow_sanity_lf] setup_params_general = { "mode": "VLAN", @@ -27,11 +29,14 @@ setup_params_general = { "vlan": 100 }]}, "rf": {}, - "radius": "DVLAN" + "radius": True } -@allure.suite("regression") +# @allure.suite("regression") +@allure.parent_suite("OpenWifi Dynamic Vlan Test") +@allure.suite("WPA2 Enterprise Security") +@allure.sub_suite("5 GHz Band") @allure.feature("VLAN MODE wpa2_enterprise Dynamic Vlan") @pytest.mark.parametrize( 'setup_configuration', @@ -47,6 +52,7 @@ class TestDynamicVlanOverSsid5GWpa2(object): @pytest.mark.fiveg @allure.testcase(name="test_dynamic_precedence_over_ssid_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5705") + @allure.title("Test for dynamic precedence over ssid") def test_dynamic_precedence_over_ssid_vlan_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ @@ -60,35 +66,22 @@ class TestDynamicVlanOverSsid5GWpa2(object): mode = "VLAN" band = "fiveg" vlan = [100,200] - ttls_passwd = "passwordB" #radius_info["password"] # + ttls_passwd = "passwordB" eap = "TTLS" - identity = "userB" #radius_info['user'] # + identity = "userB" val = "" - # upstream_port = lf_tools.upstream_port - # print(upstream_port) - # port_resources = upstream_port.split(".") port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - # print(lf_tools.dut_idx_mapping) - # lf_tools.reset_scenario() - # for i in vlan: - get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, num_sta=1, dut_data=setup_configuration) - # get_test_library.enterprise_client_connectivity_test(ssid=ssid_5G, passkey="[BLANK]", security="wpa2", extra_securities=[], - # mode=mode, band="fiveg", vlan_id=vlan[0], - # station_name=station_names_fiveg, key_mgmt="WPA-EAP", - # pairwise="NA", group="NA", wpa_psk="DEFAULT", - # ttls_passwd="passwordB", ieee80211w=0, - # wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True) + station_ip = get_test_library.station_data[list(get_test_library.station_data.keys())[0]]['ip'] eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] - eth_radius_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[1]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + @@ -96,31 +89,18 @@ class TestDynamicVlanOverSsid5GWpa2(object): sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_radius_vlan_ip.split('.') - print("station ip...", sta_ip_1) - print("vlan ip...", eth_radius_vlan_ip) - print("eth_upstream_ip..", eth_ip) + logging.info(f"station ip...{sta_ip_1}\neth.{vlan[0]}...{eth_ssid_vlan_ip}\neth.{vlan[1]}...{eth_radius_vlan_ip}" + f"\neth_upstream_ip...{eth_ip}") if sta_ip_1[0] == "0": - print("station didnt received any ip") - allure.attach("station didnt recieved ip..") - assert False + assert False, result elif eth_vlan_ip_1[0] == "0": - print("radius configured vlan didnt recieved ip") - assert False + assert False, result for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): if i != j: val = False else: val = True - - allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) - allure.attach(name="ssid configured vlan ip....", body=str(eth_ssid_vlan_ip)) - allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan[1]))) - allure.attach(name="radius configured vlan ip....", body=str(eth_radius_vlan_ip)) - allure.attach(name="upstream ip....", body=str(eth_ip)) if val: - assert True - print("Station ip assigned as per dynamic vlan") + assert True, result elif not val: - print("Station ip not assigned as per dynamic vlan") - assert False \ No newline at end of file + assert False, result diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa2.py index a9fde423e..22178c6ed 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa2.py @@ -5,17 +5,18 @@ """ -import os import allure import pytest import time -from configuration import DYNAMIC_VLAN_RADIUS_SERVER_DATA -from configuration import DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA +import importlib +import logging -pytestmark = [pytest.mark.ow_regression_lf, - pytest.mark.ow_dvlan_tests_lf, - pytest.mark.wpa2_enterprise, - pytest.mark.fiveg] +lf_library = importlib.import_module("configuration") +DYNAMIC_VLAN_RADIUS_SERVER_DATA = lf_library.DYNAMIC_VLAN_RADIUS_SERVER_DATA +DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA = lf_library.DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA + +pytestmark = [pytest.mark.dynamic_vlan_tests, + pytest.mark.vlan] setup_params_general = { "mode": "VLAN", @@ -32,7 +33,10 @@ setup_params_general = { } -@allure.suite("regression") +# @allure.suite("regression") +@allure.parent_suite("OpenWifi Dynamic Vlan Test") +@allure.suite("WPA2 Enterprise Security") +@allure.sub_suite("5 GHz Band") @allure.feature("VLAN MODE wpa2_enterprise Dynamic Vlan") @pytest.mark.parametrize( 'setup_configuration', @@ -46,8 +50,10 @@ class TestDynamicVlan5GWpa2(object): @pytest.mark.absence_of_radius_vlan_identifier @pytest.mark.wpa2_enterprise @pytest.mark.fiveg + @pytest.mark.ow_sanity_lf @allure.testcase(name="test_ssid_vlan_in_the_absence_of_radius_vlan_identifier", url="https://telecominfraproject.atlassian.net/browse/WIFI-5704") + @allure.title("Test for ssid vlan in the absence of radius vlan identifier") def test_ssid_vlan_in_the_absence_of_radius_vlan_identifier_5g_wpa2(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ @@ -60,59 +66,43 @@ class TestDynamicVlan5GWpa2(object): extra_secu = [] band = "fiveg" mode = "VLAN" - vlan = 100 - ttls_passwd = "passwordvlannotsentuser" # radius_info["password"] # + vlan = [100] + ttls_passwd = "passwordvlannotsentuser" eap = "TTLS" identity = "vlannotsentuser" val = "" - # upstream_port = get_test_library.upstream_port - # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - # print(get_test_library.dut_idx_mapping) - # get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan]) + get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap, d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, num_sta=1, dut_data=setup_configuration) - + station_ip = get_test_library.station_data[list(get_test_library.station_data.keys())[0]]['ip'] eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_vlan_ip.split('.') - print("station ip...", sta_ip_1) - print("ssid configured vlan ip...", eth_vlan_ip) - print("eth_upstream_ip..", eth_ip) + logging.info(f"station ip...{sta_ip_1}\neth.{vlan[0]}...{eth_vlan_ip}\neth_upstream_ip...{eth_ip}") if sta_ip_1[0] == "0": - print("station didnt received any ip") - allure.attach("station didnt recieved ip..") - assert False + assert False, result elif eth_vlan_ip[0] == "0": - print("ssid configured vlan didnt recieved ip") - assert False + assert False, result for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): if i != j: val = False elif i == j: val = True - allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) - allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) - allure.attach(name="upstream port....", body=str(port_resources[2])) - allure.attach(name="upstream ip....", body=str(eth_ip)) if val: - assert True - print("Station ip assigned as per ssid vlan") + assert True, result elif not val: - print("Station ip not assigned as per ssid vlan") - assert False + assert False, result @pytest.mark.invalidradiusvlan @pytest.mark.wpa2_enterprise @@ -136,14 +126,14 @@ class TestDynamicVlan5GWpa2(object): eap = "TTLS" identity = "invalidvlanuser" val = "" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() get_test_library.add_vlan(vlan_ids=[vlan]) - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid = ssid_name, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid = ssid_name, security = security, extra_securities = extra_secu, vlan_id = vlan, mode = mode, band = band, eap = eap, d_vlan = True, ttls_passwd = ttls_passwd, ieee80211w = 0, identity = identity, num_sta = 1, dut_data = setup_configuration) @@ -204,16 +194,16 @@ class TestDynamicVlan5GWpa2(object): eap = "TTLS" identity = "userB" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid = ssid_name, security = security, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid = ssid_name, security = security, extra_securities = extra_secu, vlan_id = vlan, mode = mode, band = band, eap = eap, d_vlan = True, ttls_passwd = ttls_passwd, ieee80211w = 0, @@ -254,7 +244,7 @@ class TestDynamicVlan5GWpa2(object): time.sleep(30) for u in get_test_library.json_get("/port/?fields=port+type,alias")['interfaces']: if list(u.values())[0]['port type'] not in ['Ethernet', 'WIFI-Radio', 'NA']: - station_name = (u.values())[0]['alias'] + station_name = list(u.values())[0]['alias'] get_test_library.admin_up_down([station_name], option="up") sta_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + @@ -292,25 +282,25 @@ class TestDynamicVlan5GWpa2(object): extra_secu = [] band = "fiveg" mode = "VLAN" - vlan = 100 + vlan = [100] ttls_passwd = "passwordvlannotsentuser" eap = "TTLS" identity = "vlannotsentuser" val = "" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan]) + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap, d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, num_sta=1, dut_data=setup_configuration) eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] @@ -333,7 +323,7 @@ class TestDynamicVlan5GWpa2(object): else: val = True allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) + allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -368,7 +358,7 @@ class TestDynamicVlan5GWpa2(object): get_test_library.reset_scenario() get_test_library.add_vlan(vlan_ids=[vlan]) - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="fiveg", vlan_id=100, station_name=station_names_fiveg, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", @@ -416,18 +406,18 @@ class TestDynamicVlan5GWpa2(object): extra_secu = [] band = "fiveg" mode = "VLAN" - vlan = 100 + vlan = [100] ttls_passwd = "passwordoutofboundvlanuser" eap = "TTLS" identity = "outofboundvlanuser" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan]) + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, @@ -435,7 +425,7 @@ class TestDynamicVlan5GWpa2(object): dut_data=setup_configuration) eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] @@ -443,7 +433,7 @@ class TestDynamicVlan5GWpa2(object): print("station ip...", station_ip) assert True allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) + allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -472,14 +462,14 @@ class TestDynamicVlan5GWpa2(object): eap = "TTLS" identity = "userB" val = "" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, @@ -542,17 +532,17 @@ class TestDynamicVlan5GWpa2(object): extra_secu = [] band = "fiveg" mode = "VLAN" - vlan = 100 + vlan = [100] ttls_passwd = "passwordA" eap = "TTLS" identity = "userA" val = "" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan]) + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) station_list = [] sta_ip = [] @@ -562,7 +552,7 @@ class TestDynamicVlan5GWpa2(object): print([station_list[0]]) for m in range(0, len(station_list)): - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, @@ -577,7 +567,7 @@ class TestDynamicVlan5GWpa2(object): time.sleep(30) eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] eth_vlan_ip_1 = eth_vlan_ip.split('.') @@ -592,7 +582,7 @@ class TestDynamicVlan5GWpa2(object): else: val = True allure.attach(name="station ip....", body=str(sta_ip[n])) - allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan))) + allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="radius configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -625,11 +615,11 @@ class TestDynamicVlan5GWpa2(object): eap = "TTLS" identity = "userA" val = "" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() get_test_library.add_vlan(vlan_ids=vlan) station_list = [] @@ -640,7 +630,7 @@ class TestDynamicVlan5GWpa2(object): station_list.append(get_test_library.fiveg_prefix + str(i)) for user_id, user_pass, sta in zip(dynamic_vlan_user, dynamic_vlan_pass, range(0, len(station_list))): - passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="fiveg", vlan_id=vlan[sta], station_name=[station_list[sta]], key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py index 41662a0da..ce6e6cbed 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py @@ -5,16 +5,18 @@ """ -import os import allure import pytest -from configuration import DYNAMIC_VLAN_RADIUS_SERVER_DATA -from configuration import DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA +import importlib +import logging -pytestmark = [pytest.mark.ow_regression_lf, - pytest.mark.ow_dvlan_tests_lf, - pytest.mark.wpa2_enterprise, - pytest.mark.twog] +lf_library = importlib.import_module("configuration") +DYNAMIC_VLAN_RADIUS_SERVER_DATA = lf_library.DYNAMIC_VLAN_RADIUS_SERVER_DATA +DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA = lf_library.DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA + +pytestmark = [pytest.mark.dynamic_vlan_tests, + pytest.mark.vlan, + pytest.mark.ow_sanity_lf] setup_params_general = { "mode": "VLAN", @@ -31,15 +33,18 @@ setup_params_general = { } -@allure.suite("regression") +# @allure.suite("regression") +@allure.parent_suite("OpenWifi Dynamic Vlan Test") +@allure.suite("WPA2 Enterprise Security") +@allure.sub_suite("2.4 GHz Band") @allure.feature("VLAN MODE wpa2_enterprise Dynamic Vlan") @pytest.mark.parametrize( - 'setup_profiles', + 'setup_configuration', [setup_params_general], indirect=True, scope="class" ) -@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.usefixtures("setup_configuration") class TestDynamicVlanOverSsid2GWpa2(object): @pytest.mark.dynamic_precedence_over_ssid @@ -47,6 +52,7 @@ class TestDynamicVlanOverSsid2GWpa2(object): @pytest.mark.twog @allure.testcase(name="test_dynamic_precedence_over_ssid_vlan", url="https://telecominfraproject.atlassian.net/browse/WIFI-5705") + @allure.title("Test for dynamic precedence over ssid") def test_dynamic_precedence_over_ssid_vlan_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ @@ -63,20 +69,16 @@ class TestDynamicVlanOverSsid2GWpa2(object): ttls_passwd = "passwordB" eap = "TTLS" identity = "userB" - val = "" - upstream_port = get_test_library.upstream_port - print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, security=security, extra_securities=extra_secu, + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, + extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, num_sta=1, dut_data=setup_configuration) + station_ip = get_test_library.station_data[list(get_test_library.station_data.keys())[0]]['ip'] eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] @@ -87,31 +89,18 @@ class TestDynamicVlanOverSsid2GWpa2(object): sta_ip_1 = station_ip.split('.') eth_vlan_ip_1 = eth_radius_vlan_ip.split('.') - print("station ip...", station_ip) - print("vlan ip...", eth_radius_vlan_ip) - print("eth_upstream_ip..", eth_ip) + logging.info(f"station ip...{sta_ip_1}\neth.{vlan[0]}...{eth_ssid_vlan_ip}\neth.{vlan[1]}...{eth_radius_vlan_ip}" + f"\neth_upstream_ip...{eth_ip}") if sta_ip_1[0] == "0": - print("station didnt received any ip") - allure.attach("station didnt recieved ip..") - assert False + assert False, result elif eth_vlan_ip_1[0] == "0": - print("radius configured vlan didnt recieved ip") - assert False + assert False, result for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): if i != j: val = False else: val = True - - allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) - allure.attach(name="ssid configured vlan ip....", body=str(eth_ssid_vlan_ip)) - allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan[1]))) - allure.attach(name="radius configured vlan ip....", body=str(eth_radius_vlan_ip)) - allure.attach(name="upstream ip....", body=str(eth_ip)) if val: - assert True - print("Station ip assigned as per dynamic vlan") + assert True, result elif not val: - print("Station ip not assigned as per dynamic vlan") - assert False \ No newline at end of file + assert False, result diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_vlan_twog_wpa2.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_vlan_twog_wpa2.py index 110600758..1f9d980eb 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_vlan_twog_wpa2.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_vlan_twog_wpa2.py @@ -5,17 +5,18 @@ """ -import os import allure import pytest import time -from configuration import DYNAMIC_VLAN_RADIUS_SERVER_DATA -from configuration import DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA +import importlib +import logging -pytestmark = [pytest.mark.ow_regression_lf, - pytest.mark.ow_dvlan_tests_lf, - pytest.mark.wpa2_enterprise, - pytest.mark.twog] +lf_library = importlib.import_module("configuration") +DYNAMIC_VLAN_RADIUS_SERVER_DATA = lf_library.DYNAMIC_VLAN_RADIUS_SERVER_DATA +DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA = lf_library.DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA + +pytestmark = [pytest.mark.dynamic_vlan_tests, + pytest.mark.vlan] setup_params_general = { "mode": "VLAN", @@ -32,22 +33,27 @@ setup_params_general = { } -@allure.suite("regression") +# @allure.suite("regression") +@allure.parent_suite("OpenWifi Dynamic Vlan Test") +@allure.suite("WPA2 Enterprise Security") +@allure.sub_suite("2.4 GHz Band") @allure.feature("VLAN MODE wpa2_enterprise Dynamic Vlan") @pytest.mark.parametrize( - 'setup_profiles', + 'setup_configuration', [setup_params_general], indirect=True, scope="class" ) -@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.usefixtures("setup_configuration") class TestDynamicVlan2GWpa2(object): @pytest.mark.absence_of_radius_vlan_identifier @pytest.mark.wpa2_enterprise @pytest.mark.twog + @pytest.mark.ow_sanity_lf @allure.testcase(name="test_ssid_vlan_in_the_absence_of_radius_vlan_identifier", url="https://telecominfraproject.atlassian.net/browse/WIFI-5704") + @allure.title("Test for ssid vlan in the absence of radius vlan identifier") def test_ssid_vlan_in_the_absence_of_radius_vlan_identifier_2g_wpa2(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs, num_stations, setup_configuration): """ @@ -60,25 +66,23 @@ class TestDynamicVlan2GWpa2(object): security = "wpa2" extra_secu = [] band = "twog" - vlan = 100 + vlan = [100] ttls_passwd = "passwordvlannotsentuser" eap = "TTLS" identity = "vlannotsentuser" val = "" - upstream_port = get_test_library.upstream_port - print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan]) - passes, result, station_ip = passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, + get_test_library.add_vlan(vlan_ids=vlan) + + passes, result = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, security=security, extra_securities=extra_secu, vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, num_sta=1, dut_data=setup_configuration) + station_ip = get_test_library.station_data[list(get_test_library.station_data.keys())[0]]['ip'] eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] @@ -86,33 +90,20 @@ class TestDynamicVlan2GWpa2(object): sta_ip_1 = station_ip.split('.') print(sta_ip_1) eth_vlan_ip_1 = eth_vlan_ip.split('.') - # eth_ip_1 = eth_ip.split('.') if sta_ip_1[0] == "0": - print("station didnt received any ip") - allure.attach("station didnt recieved ip..") - assert False + assert False, result elif eth_vlan_ip[0] == "0": - print("ssid configured vlan didnt recieved ip") - assert False - print("station ip...", station_ip) - print("upstream ip...", eth_ip) - print("ssid configured vlan ip", eth_vlan_ip) + assert False, result + logging.info(f"station ip...{sta_ip_1}\neth.{vlan[0]}...{eth_vlan_ip}\neth_upstream_ip...{eth_ip}") for i, j in zip(sta_ip_1[0:2], eth_vlan_ip_1[0:2]): if i != j: val = False elif i == j: val = True - allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) - allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) - allure.attach(name="upstream port....", body=str(port_resources[2])) - allure.attach(name="upstream ip....", body=str(eth_ip)) if val: - assert True - print("Station ip assigned as per ssid vlan") + assert True, result elif not val: - print("Station ip not assigned as per ssid vlan") - assert False + assert False, result @pytest.mark.invalidradiusvlan @pytest.mark.wpa2_enterprise @@ -131,27 +122,26 @@ class TestDynamicVlan2GWpa2(object): security = "wpa2" extra_secu = [] band = "twog" - vlan_id = 100 + vlan = [100] ttls_passwd = "passwordinvalidvlanuser" eap = "TTLS" identity = "invalidvlanuser" val = "" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan_id]) + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() + get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="twog", vlan_id=vlan_id, - station_name=station_names_twog, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordinvalidvlanuser", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="invalidvlanuser", d_vlan=True) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, + security=security, extra_securities=extra_secu, + vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, + num_sta=1, dut_data=setup_configuration) eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan_id))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] @@ -173,7 +163,7 @@ class TestDynamicVlan2GWpa2(object): else: val = True allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan_id))) + allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -205,19 +195,18 @@ class TestDynamicVlan2GWpa2(object): ttls_passwd = "passwordB" eap = "TTLS" identity = "userB" - upstream_port = get_test_library.upstream_port - print(upstream_port) + # upstream_port = get_test_library.upstream_port + # print(upstream_port) port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') - print(get_test_library.dut_idx_mapping) - get_test_library.reset_scenario() + # print(get_test_library.dut_idx_mapping) + # get_test_library.reset_scenario() get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="twog", vlan_id=vlan[1], - station_name=station_names_twog, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordB", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True, cleanup=False) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, + security=security, extra_securities=extra_secu, + vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, + num_sta=1, dut_data=setup_configuration, cleanup=False) eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] @@ -251,10 +240,13 @@ class TestDynamicVlan2GWpa2(object): continue count = count + 1 time.sleep(30) - get_test_library.admin_up_down([station_names_twog[0]], option="up") + for u in get_test_library.json_get("/port/?fields=port+type,alias")['interfaces']: + if list(u.values())[0]['port type'] not in ['Ethernet', 'WIFI-Radio', 'NA']: + station_name = (u.values())[0]['alias'] + get_test_library.admin_up_down(station_name, option="up") sta_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + station_names_twog[0])["interface"]["ip"] + "/" + station_name)["interface"]["ip"] sta_ip_1 = sta_ip.split('.') print(sta_ip) allure.attach(name="station ip....", body=str(sta_ip)) @@ -288,7 +280,7 @@ class TestDynamicVlan2GWpa2(object): security = "wpa2" extra_secu = [] band = "twog" - vlan = 100 + vlan = [100] ttls_passwd = "passwordvlannotsentuser" eap = "TTLS" identity = "vlannotsentuser" @@ -298,17 +290,16 @@ class TestDynamicVlan2GWpa2(object): port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') print(get_test_library.dut_idx_mapping) get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan]) + get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="twog", vlan_id=vlan, - station_name=station_names_twog, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordvlannotsentuser", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="vlannotsentuser", d_vlan=True) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, + security=security, extra_securities=extra_secu, + vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, + num_sta=1, dut_data=setup_configuration) eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] @@ -331,7 +322,7 @@ class TestDynamicVlan2GWpa2(object): else: val = True allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) + allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -366,7 +357,7 @@ class TestDynamicVlan2GWpa2(object): get_test_library.reset_scenario() get_test_library.add_vlan(vlan_ids=[vlan]) - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=100, station_name=station_names_twog, key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT", @@ -414,7 +405,7 @@ class TestDynamicVlan2GWpa2(object): security = "wpa2" extra_secu = [] band = "twog" - vlan = 100 + vlan = [100] ttls_passwd = "passwordoutofboundvlanuser" eap = "TTLS" identity = "outofboundvlanuser" @@ -423,17 +414,16 @@ class TestDynamicVlan2GWpa2(object): port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') print(get_test_library.dut_idx_mapping) get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan]) + get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="twog", vlan_id=vlan, - station_name=station_names_twog, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordoutofboundvlanuser", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="outofboundvlanuser", d_vlan=True) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, + security=security, extra_securities=extra_secu, + vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, + num_sta=1, dut_data=setup_configuration) eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] @@ -441,7 +431,7 @@ class TestDynamicVlan2GWpa2(object): print("station ip...", station_ip) assert True allure.attach(name="station ip....", body=str(station_ip)) - allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan))) + allure.attach(name="ssid configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="ssid configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -477,12 +467,11 @@ class TestDynamicVlan2GWpa2(object): get_test_library.reset_scenario() get_test_library.add_vlan(vlan_ids=vlan) - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="twog", vlan_id=vlan[0], - station_name=station_names_twog, key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordB", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="userB", d_vlan=True) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, + security=security, extra_securities=extra_secu, + vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, + num_sta=1, dut_data=setup_configuration) eth_ssid_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] @@ -540,7 +529,7 @@ class TestDynamicVlan2GWpa2(object): security = "wpa2" extra_secu = [] band = "twog" - vlan = 100 + vlan = [100] ttls_passwd = "passwordA" eap = "TTLS" identity = "userA" @@ -550,7 +539,7 @@ class TestDynamicVlan2GWpa2(object): port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.') print(get_test_library.dut_idx_mapping) get_test_library.reset_scenario() - get_test_library.add_vlan(vlan_ids=[vlan]) + get_test_library.add_vlan(vlan_ids=vlan) station_list = [] sta_ip = [] @@ -560,12 +549,11 @@ class TestDynamicVlan2GWpa2(object): print([station_list[0]]) for m in range(0, len(station_list)): - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], - mode=mode, band="twog", vlan_id=100, - station_name=[station_list[m]], key_mgmt="WPA-EAP", - pairwise="NA", group="NA", wpa_psk="DEFAULT", - ttls_passwd="passwordA", ieee80211w=0, - wep_key="NA", ca_cert="NA", eap="TTLS", identity="userA", d_vlan=True, cleanup=False) + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, + security=security, extra_securities=extra_secu, + vlan_id=vlan, mode=mode, band=band, eap=eap,d_vlan=True, + ttls_passwd=ttls_passwd, ieee80211w=0, identity=identity, + num_sta=1, dut_data=setup_configuration, cleanup=False) get_test_library.admin_up_down([station_list[m]], option="up") sta_ip.append(get_test_library.station_ip[station_list[m]]) if sta_ip[m] == "0.0.0.0": @@ -575,7 +563,7 @@ class TestDynamicVlan2GWpa2(object): time.sleep(30) eth_vlan_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + - "/" + port_resources[2] + "." + str(vlan))["interface"]["ip"] + "/" + port_resources[2] + "." + str(vlan[0]))["interface"]["ip"] eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] + "/" + port_resources[2])["interface"]["ip"] eth_vlan_ip_1 = eth_vlan_ip.split('.') @@ -590,7 +578,7 @@ class TestDynamicVlan2GWpa2(object): else: val = True allure.attach(name="station ip....", body=str(sta_ip[n])) - allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan))) + allure.attach(name="radius configured vlan..", body=str(port_resources[2] + "." + str(vlan[0]))) allure.attach(name="radius configured vlan ip..", body=str(eth_vlan_ip)) allure.attach(name="upstream port....", body=str(port_resources[2])) allure.attach(name="upstream ip....", body=str(eth_ip)) @@ -638,7 +626,7 @@ class TestDynamicVlan2GWpa2(object): station_list.append(get_test_library.twog_prefix + str(i)) for user_id, user_pass, sta in zip(dynamic_vlan_user, dynamic_vlan_pass, range(0, len(station_list))): - passes, result, station_ip = get_test_library.EAP_Connect(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], + passes, result, station_ip = get_test_library.enterprise_client_connectivity_test(ssid=ssid_name, passkey="[BLANK]", security="wpa2", extra_securities=[], mode=mode, band="twog", vlan_id=vlan[sta], station_name=[station_list[sta]], key_mgmt="WPA-EAP", pairwise="NA", group="NA", wpa_psk="DEFAULT",