Skip to content

Commit

Permalink
Modified upstream in dvlan test cases (#1007)
Browse files Browse the repository at this point in the history 
Signed-off-by: jitendracandela <[email protected]>
  • Loading branch information
@jitendracandela @anil-tegala
jitendracandela authored and anil-tegala committed Dec 3, 2024
1 parent 82dbb0b commit 50cf6c0
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 15 deletions.
4 changes: 3 additions & 1 deletion ...g_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def test_dynamic_precedence_over_ssid_vlan_5g_wpa2(self, get_test_library, get_d
mode=mode, band=band, eap=eap,
ttls_passwd=ttls_passwd, ieee80211w=0,
identity=identity, num_sta=1,
dut_data=setup_configuration)
dut_data=setup_configuration, 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"]
Expand All @@ -103,3 +103,5 @@ def test_dynamic_precedence_over_ssid_vlan_5g_wpa2(self, get_test_library, get_d
assert True, result
elif not val:
assert False, result
assert passes == "PASS", result

27 changes: 16 additions & 11 deletions ...ing_modes/vlan_mode/dynamic_vlan/wpa2_enterprise/twog/test_dynamic_over_ssid_twog_wpa2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ class TestDynamicVlanOverSsid2GWpa2(object):
@allure.title("Verify that Dynamic VLAN takes precedence over configured SSID VLAN")
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-5705", name="WIFI-5705")
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, check_connectivity):
get_test_device_logs, num_stations, setup_configuration,
check_connectivity):
"""
To Verify that Dynamic VLAN takes precedence over configured SSID VLAN
Unique Marker: pytest -m "dynamic_precedence_over_ssid and wpa2_enterprise and vlan"
Expand All @@ -65,31 +66,34 @@ def test_dynamic_precedence_over_ssid_vlan_2g_wpa2(self, get_test_library, get_d
security = "wpa2"
extra_secu = []
band = "twog"
vlan = [100,200]
vlan = [100, 200]
ttls_passwd = "passwordB"
eap = "TTLS"
identity = "userB"
val = ""
port_resources = list(get_test_library.lanforge_data['wan_ports'].keys())[0].split('.')

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,
ttls_passwd=ttls_passwd, ieee80211w=0,
identity=identity, num_sta=1, dut_data=setup_configuration)
extra_securities=extra_secu,
vlan_id=vlan, mode=mode, band=band,
eap=eap,
ttls_passwd=ttls_passwd, ieee80211w=0,
identity=identity, num_sta=1,
dut_data=setup_configuration, 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"]
"/" + 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"]
"/" + port_resources[2] + "." + str(vlan[1]))["interface"]["ip"]
eth_ip = get_test_library.json_get("/port/" + port_resources[0] + "/" + port_resources[1] +
"/" + port_resources[2])["interface"]["ip"]
"/" + port_resources[2])["interface"]["ip"]

sta_ip_1 = station_ip.split('.')
eth_vlan_ip_1 = eth_radius_vlan_ip.split('.')
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}")
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":
assert False, result
elif eth_vlan_ip_1[0] == "0":
Expand All @@ -103,3 +107,4 @@ def test_dynamic_precedence_over_ssid_vlan_2g_wpa2(self, get_test_library, get_d
assert True, result
elif not val:
assert False, result
assert passes == "PASS", result
5 changes: 3 additions & 2 deletions ...g_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def test_dynamic_precedence_over_ssid_vlan_5g_wpa3(self, get_test_library, get_
mode=mode, band=band, eap=eap,
ttls_passwd=ttls_passwd, ieee80211w=0,
identity=identity, num_sta=1, key_mgmt="WPA-EAP-SHA256",
dut_data=setup_configuration)
dut_data=setup_configuration, 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"]
Expand All @@ -100,4 +100,5 @@ def test_dynamic_precedence_over_ssid_vlan_5g_wpa3(self, get_test_library, get_
if val:
assert True, result
elif not val:
assert False, result
assert False, result
assert passes == "PASS", result
4 changes: 3 additions & 1 deletion ...ing_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ def test_dynamic_precedence_over_ssid_vlan_2g_wpa3(self, get_test_library, get_d
extra_securities=extra_secu, key_mgmt="WPA-EAP-SHA256",
vlan_id=vlan, mode=mode, band=band, eap=eap,
ttls_passwd=ttls_passwd, ieee80211w=0,
identity=identity, num_sta=1, dut_data=setup_configuration)
identity=identity, num_sta=1, dut_data=setup_configuration,
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] +
Expand All @@ -101,3 +102,4 @@ def test_dynamic_precedence_over_ssid_vlan_2g_wpa3(self, get_test_library, get_d
assert True, result
elif not val:
assert False, result
assert passes == "PASS", result

0 comments on commit 50cf6c0

Please sign in to comment.