diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index 4fb18fb73..4d046882a 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -2315,3 +2315,5 @@ if __name__ == '__main__': # print(a) # print(obj.eap_connect.json_get("port/1/1/sta0000?fields=ap,ip")) # obj.EAP_Connect(station_name=["sta0000", "sta0001"], eap="TTLS", ssid="testing_radius") + + diff --git a/libs/lanforge/lf_tools.py b/libs/lanforge/lf_tools.py index 1ced61783..f08090b28 100755 --- a/libs/lanforge/lf_tools.py +++ b/libs/lanforge/lf_tools.py @@ -889,3 +889,4 @@ def main(): if __name__ == '__main__': main() + diff --git a/tests/e2e/advanced/downlink_mu_mimo_test/open/test_bridge_mode.py b/tests/e2e/advanced/downlink_mu_mimo_test/open/test_bridge_mode.py index e3e83ba02..1e2b162ee 100644 --- a/tests/e2e/advanced/downlink_mu_mimo_test/open/test_bridge_mode.py +++ b/tests/e2e/advanced/downlink_mu_mimo_test/open/test_bridge_mode.py @@ -163,4 +163,3 @@ class TestMuMimoBridge(object): else: assert False - diff --git a/tests/e2e/advanced/receiver_sensitivity/test_bridge_mode_2g.py b/tests/e2e/advanced/receiver_sensitivity/test_bridge_mode_2g.py index 4ff5ecfd2..4d78b0849 100644 --- a/tests/e2e/advanced/receiver_sensitivity/test_bridge_mode_2g.py +++ b/tests/e2e/advanced/receiver_sensitivity/test_bridge_mode_2g.py @@ -2076,4 +2076,4 @@ class TestRxSensitivityBRIDGE2G(object): lf_test.Client_disconnect(station_name=station_names_twog) assert station else: - assert False + assert False \ No newline at end of file diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py index 3bf18fedf..3d7502fc4 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py @@ -111,3 +111,4 @@ class TestDynamicVlanOverSsid5GWpa3(object): elif not val: print("Station ip not assigned as per dynamic vlan") assert False + diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py index 05dcaea05..8d907a590 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py @@ -69,7 +69,7 @@ class TestDynamicVlan5GWpa3(object): lf_tools.add_vlan(vlan_ids=[vlan_id]) lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa3", extra_securities=[], mode=mode, band="fiveg", - station_name=station_names_fiveg, key_mgmt="WPA-EAP-SHA256", + 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) @@ -137,7 +137,7 @@ class TestDynamicVlan5GWpa3(object): lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa3", extra_securities=[], mode=mode, band="fiveg", vlan_id=vlan_id, - station_name=station_names_fiveg, key_mgmt="WPA-EAP-SHA256", + 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) @@ -203,7 +203,7 @@ class TestDynamicVlan5GWpa3(object): lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa3", extra_securities=[], mode=mode, band="fiveg", vlan_id=vlan[1], - station_name=station_names_fiveg, key_mgmt="WPA-EAP-SHA256", + 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) @@ -286,7 +286,7 @@ class TestDynamicVlan5GWpa3(object): lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa3", extra_securities=[], mode=mode, band="fiveg", vlan_id=vlan, - station_name=station_names_fiveg, key_mgmt="WPA-EAP-SHA256", + 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) @@ -331,7 +331,15 @@ class TestDynamicVlan5GWpa3(object): @pytest.mark.wpa2_enterprise @pytest.mark.fiveg @allure.testcase(name="test_dynamic_unsupported_vlan", +<<<<<<< HEAD +<<<<<<< HEAD url="https://telecominfraproject.atlassian.net/browse/WIFI-6102") +======= + url="https://telecominfraproject.atlassian.net/browse/WIFI-5710") +>>>>>>> 5353d886f... Created testcases for WAP3_eap security +======= + url="https://telecominfraproject.atlassian.net/browse/WIFI-5710") +>>>>>>> c2673ef01... Created testcases for WAP3_eap security def test_dynamic_unsupported_vlan(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration, station_names_fiveg): @@ -406,7 +414,7 @@ class TestDynamicVlan5GWpa3(object): lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa3", extra_securities=[], mode=mode, band="fiveg", vlan_id=vlan, - station_name=station_names_fiveg, key_mgmt="WPA-EAP-SHA256", + 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) @@ -453,7 +461,7 @@ class TestDynamicVlan5GWpa3(object): lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa3", extra_securities=[], mode=mode, band="fiveg", vlan_id=vlan[0], - station_name=station_names_fiveg, key_mgmt="WPA-EAP-SHA256", + 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) @@ -533,7 +541,7 @@ class TestDynamicVlan5GWpa3(object): for m in range(0, len(station_list)): lf_test.EAP_Connect(ssid=ssid_5G, passkey="[BLANK]", security="wpa3", extra_securities=[], mode=mode, band="fiveg", vlan_id=100, - station_name=[station_list[m]], key_mgmt="WPA-EAP-SHA256", + 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) @@ -608,7 +616,7 @@ class TestDynamicVlan5GWpa3(object): 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="wpa3", extra_securities=[], mode=mode, band="fiveg", vlan_id=vlan[sta], - station_name=[station_list[sta]], key_mgmt="WPA-EAP-SHA256", + 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) @@ -647,4 +655,3 @@ class TestDynamicVlan5GWpa3(object): assert False lf_tools.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/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py index b138a4ffa..d1b66e5eb 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py @@ -68,7 +68,7 @@ class TestDynamicVlanOverSsid2GWpa3(object): lf_test.EAP_Connect(ssid=ssid_2G, passkey="[BLANK]", security="wpa3", extra_securities=[], mode=mode, band="twog", vlan_id=vlan[0], - station_name=station_names_twog, key_mgmt="WPA-EAP-SHA256", + 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) diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py index a0d8a921d..c944d9819 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py @@ -645,4 +645,3 @@ class TestDynamicVlan2GWpa3(object): assert False lf_tools.admin_up_down([station_list[sta]], option="up") time.sleep(5) -