scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-04 04:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the dict changing size issue

Browse Source 
Signed-off-by: shivam <shivam.thakur@candelatech.com>
This commit is contained in:
shivam
2022-08-19 12:34:04 +05:30
parent b7cd37de2d
commit c456a56faa
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lf_libs/lf_libs.py
View File

@@ -452,7 +452,8 @@ class lf_libs:
r_val.pop(dut) r_val.pop(dut)
if mode == "NAT-LAN": if mode == "NAT-LAN":
ret = self.get_lan_upstream_ports() ret = self.get_lan_upstream_ports()
for dut in r_val: temp = r_val.copy()
for dut in temp:
if ret.keys().__contains__(dut) and ret[dut] is not None: if ret.keys().__contains__(dut) and ret[dut] is not None:
upstream_data = (ret[dut]).split(".") upstream_data = (ret[dut]).split(".")
r_val[dut]["upstream_port"] = ret[dut] r_val[dut]["upstream_port"] = ret[dut]
@@ -469,6 +470,7 @@ class lf_libs:
logging.error("VLAN ID is Unspecified in the VLAN Case") logging.error("VLAN ID is Unspecified in the VLAN Case")
pytest.skip("VLAN ID is Unspecified in the VLAN Case") pytest.skip("VLAN ID is Unspecified in the VLAN Case")
else: else:
self.add_vlan(vlan_ids=[vlan_id])
ret = self.get_wan_upstream_ports() ret = self.get_wan_upstream_ports()
for dut in r_val: for dut in r_val:
if ret.keys().__contains__(dut) and ret[dut] is not None: if ret.keys().__contains__(dut) and ret[dut] is not None:
@@ -652,9 +654,8 @@ class lf_libs:
r_val[dut["identifier"]]["passkey"] = dut["ssid"]["2g-password"] r_val[dut["identifier"]]["passkey"] = dut["ssid"]["2g-password"]
r_val[dut["identifier"]]["encryption"] = dut["ssid"]["2g-encryption"] r_val[dut["identifier"]]["encryption"] = dut["ssid"]["2g-encryption"]
r_val[dut["identifier"]]["bssid"] = dut["ssid"]["2g-bssid"] r_val[dut["identifier"]]["bssid"] = dut["ssid"]["2g-bssid"]
if dut["ssid"]["2g-encryption"] == "OPEN": if str(dut["ssid"]["2g-encryption"]).upper() == "OPEN":
ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["2g-ssid"] + ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["2g-ssid"] +
' password=' + dut["ssid"]["2g-password"] +
' bssid=' + dut["ssid"]["2g-bssid"]]) ' bssid=' + dut["ssid"]["2g-bssid"]])
else: else:
ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["2g-ssid"] + ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["2g-ssid"] +
@@ -667,9 +668,8 @@ class lf_libs:
r_val[dut["identifier"]]["passkey"] = dut["ssid"]["5g-password"] r_val[dut["identifier"]]["passkey"] = dut["ssid"]["5g-password"]
r_val[dut["identifier"]]["encryption"] = dut["ssid"]["5g-encryption"] r_val[dut["identifier"]]["encryption"] = dut["ssid"]["5g-encryption"]
r_val[dut["identifier"]]["bssid"] = dut["ssid"]["5g-bssid"] r_val[dut["identifier"]]["bssid"] = dut["ssid"]["5g-bssid"]
if dut["ssid"]["5g-encryption"] == "OPEN": if str(dut["ssid"]["5g-encryption"]).upper() == "OPEN":
ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["5g-ssid"] + ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["5g-ssid"] +
' password=' + dut["ssid"]["5g-password"] +
' bssid=' + dut["ssid"]["5g-bssid"]]) ' bssid=' + dut["ssid"]["5g-bssid"]])
else: else:
ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["5g-ssid"] + ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["5g-ssid"] +
@@ -682,9 +682,8 @@ class lf_libs:
r_val[dut["identifier"]]["passkey"] = dut["ssid"]["6g-password"] r_val[dut["identifier"]]["passkey"] = dut["ssid"]["6g-password"]
r_val[dut["identifier"]]["encryption"] = dut["ssid"]["6g-encryption"] r_val[dut["identifier"]]["encryption"] = dut["ssid"]["6g-encryption"]
r_val[dut["identifier"]]["bssid"] = dut["ssid"]["6g-bssid"] r_val[dut["identifier"]]["bssid"] = dut["ssid"]["6g-bssid"]
if dut["ssid"]["6g-encryption"] == "OPEN": if str(dut["ssid"]["6g-encryption"]).upper() == "OPEN":
ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["6g-ssid"] + ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["6g-ssid"] +
' password=' + dut["ssid"]["6g-password"] +
' bssid=' + dut["ssid"]["6g-bssid"]]) ' bssid=' + dut["ssid"]["6g-bssid"]])
else: else:
ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["6g-ssid"] + ssid_data.append(['ssid_idx=0 ssid=' + dut["ssid"]["6g-ssid"] +
@@ -700,9 +699,8 @@ class lf_libs:
r_val[dut["identifier"]]["passkey"] = passkey r_val[dut["identifier"]]["passkey"] = passkey
r_val[dut["identifier"]]["encryption"] = encryption r_val[dut["identifier"]]["encryption"] = encryption
r_val[dut["identifier"]]["bssid"] = bssid r_val[dut["identifier"]]["bssid"] = bssid
if encryption == "OPEN": if str(encryption).upper() == "OPEN":
ssid_data.append(['ssid_idx=0 ssid=' + ssid + ssid_data.append(['ssid_idx=0 ssid=' + ssid +
' password=' + passkey +
' bssid=' + str(bssid).upper()]) ' bssid=' + str(bssid).upper()])
else: else:
ssid_data.append(['ssid_idx=0 ssid=' + ssid + ssid_data.append(['ssid_idx=0 ssid=' + ssid +
@@ -712,7 +710,6 @@ class lf_libs:
if str(encryption).upper() in ["OPEN", "WPA", "WPA2", "WPA3", "WEP"]: if str(encryption).upper() in ["OPEN", "WPA", "WPA2", "WPA3", "WEP"]:
self.update_duts(identifier=dut["identifier"], ssid_data=ssid_data) self.update_duts(identifier=dut["identifier"], ssid_data=ssid_data)
print(r_val)
return r_val return r_val
def update_duts(self, identifier=0, ssid_data=[]): def update_duts(self, identifier=0, ssid_data=[]):

18
lf_libs/lf_tests.py
View File

@@ -49,15 +49,16 @@ class lf_tests(lf_libs):
def __init__(self, lf_data={}, dut_data={}, log_level=logging.DEBUG, run_lf=False, influx_params=None): def __init__(self, lf_data={}, dut_data={}, log_level=logging.DEBUG, run_lf=False, influx_params=None):
super().__init__(lf_data, dut_data, run_lf, log_level) super().__init__(lf_data, dut_data, run_lf, log_level)
def client_connectivity_test(self, ssid="[BLANK]", passkey="[BLANK]", dut_data={}, def client_connectivity_test(self, ssid="[BLANK]", passkey="[BLANK]", bssid="[BLANK]", dut_data={},
security="open", extra_securities=[], sta_mode=0, security="open", extra_securities=[], sta_mode=0,
num_sta=1, mode="BRIDGE", vlan_id=[None], band="twog", num_sta=1, mode="BRIDGE", vlan_id=[None], band="twog",
allure_attach=True, runtime_secs=40): allure_attach=True, runtime_secs=40):
data = self.setup_interfaces(ssid=ssid, bssid=passkey, passkey=passkey, encryption=security, data = self.setup_interfaces(ssid=ssid, bssid=bssid, passkey=passkey, encryption=security,
band=band, vlan_id=vlan_id[0], mode=mode, num_sta=num_sta) band=band, vlan_id=vlan_id[0], mode=mode, num_sta=num_sta)
self.add_vlan(vlan_ids=vlan_id)
logging.info("Setup interface data" + str(data)) logging.info("Setup interface data" + str(data))
if data == {}:
pytest.skip("Skipping This Test")
sta_connect_obj = [] sta_connect_obj = []
for dut in data: for dut in data:
for radio in data[dut]["station_data"]: for radio in data[dut]["station_data"]:
@@ -86,7 +87,6 @@ class lf_tests(lf_libs):
obj_sta_connect.side_a_pdu = 1200 obj_sta_connect.side_a_pdu = 1200
obj_sta_connect.side_b_pdu = 1500 obj_sta_connect.side_b_pdu = 1500
# changed to auto channel # changed to auto channel
self.set_radio_channel(radio=radio, channel="AUTO") self.set_radio_channel(radio=radio, channel="AUTO")
logging.info("scan ssid radio: " + str(radio.split(".")[2])) logging.info("scan ssid radio: " + str(radio.split(".")[2]))
@@ -424,7 +424,7 @@ if __name__ == '__main__':
} }
obj = lf_tests(lf_data=dict(basic_04["traffic_generator"]), dut_data=list(basic_04["device_under_tests"]), obj = lf_tests(lf_data=dict(basic_04["traffic_generator"]), dut_data=list(basic_04["device_under_tests"]),
log_level=logging.DEBUG, run_lf=True) log_level=logging.DEBUG, run_lf=False)
# A =obj.setup_interfaces(band="fiveg", vlan_id=100, mode="NAT-WAN", num_sta=1) # A =obj.setup_interfaces(band="fiveg", vlan_id=100, mode="NAT-WAN", num_sta=1)
# print(A) # print(A)
# obj.setup_relevent_profiles() # obj.setup_relevent_profiles()
@@ -436,12 +436,14 @@ if __name__ == '__main__':
# obj.create_dhcp_external()obj.add_vlan(vlan_ids=[100, 200, 300, 400, 500, 600]) # obj.create_dhcp_external()obj.add_vlan(vlan_ids=[100, 200, 300, 400, 500, 600])
# obj.get_cx_data() # obj.get_cx_data()
# obj.chamber_view() # obj.chamber_view()
dut = {'0000c1018812': [['OpenWifi', 'wpa2', 'OpenWifi', '2G', '6A:21:5F:DA:45:6F'], dut = {'0000c1018812': [['ssid_open_2g_nat', 'open', 'something', '2G', '6A:21:5F:DA:45:6F'],
{'2G': [6, 40, 2437], '5G': None, '6G': None}]} {'2G': [6, 40, 2437], '5G': None, '6G': None}]}
c = obj.client_connectivity_test(ssid="OpenWifi", passkey="OpenWifi", security="wpa2", extra_securities=[], passes, result = obj.client_connectivity_test(ssid="ssid_open_2g_nat", passkey="something", security="open",
num_sta=1, mode="BRIDGE", dut_data=dut, extra_securities=[],
num_sta=1, mode="NAT-WAN", dut_data=dut,
band="twog") band="twog")
print(passes == "PASS", result)
# obj.start_sniffer(radio_channel=1, radio="wiphy7", test_name="sniff_radio", duration=30) # obj.start_sniffer(radio_channel=1, radio="wiphy7", test_name="sniff_radio", duration=30)
# print("started") # print("started")
# time.sleep(30) # time.sleep(30)