resolved merge conflicts

Signed-off-by: karthikaeyetea <karthika.subramani@candelatech.com>
This commit is contained in:
karthikaeyetea
2022-10-13 13:22:53 +05:30
8 changed files with 22 additions and 13 deletions

View File

@@ -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")

View File

@@ -889,3 +889,4 @@ def main():
if __name__ == '__main__':
main()

View File

@@ -163,4 +163,3 @@ class TestMuMimoBridge(object):
else:
assert False

View File

@@ -2076,4 +2076,4 @@ class TestRxSensitivityBRIDGE2G(object):
lf_test.Client_disconnect(station_name=station_names_twog)
assert station
else:
assert False
assert False

View File

@@ -111,3 +111,4 @@ class TestDynamicVlanOverSsid5GWpa3(object):
elif not val:
print("Station ip not assigned as per dynamic vlan")
assert False

View File

@@ -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)

View File

@@ -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)

View File

@@ -645,4 +645,3 @@ class TestDynamicVlan2GWpa3(object):
assert False
lf_tools.admin_up_down([station_list[sta]], option="up")
time.sleep(5)