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

Merge branch 'WIFI-1321-create-a-lan-forge-pip-module' of https://github.com/Telecominfraproject/wlan-lanforge-scripts into WIFI-1321-create-a-lan-forge-pip-module

Browse Source
This commit is contained in:
jitendracandela
2022-08-18 18:14:20 +05:30
parent 1bceac9924 a593347864
commit 3d27f31a48
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lf_libs/lf_libs.py
View File

@@ -415,15 +415,15 @@ class lf_libs:
logging.error("Number of stations are not available") logging.error("Number of stations are not available")
pytest.exit("Number of stations are not available") pytest.exit("Number of stations are not available")
if mode == "BRIDGE": if mode == "BRIDGE":
upstream_port = self.upstream_port() upstream_port = self.wan_upstream_port()
elif mode == "NAT-WAN": elif mode == "NAT-WAN":
upstream_port = self.upstream_port() upstream_port = self.wan_upstream_port()
elif mode == "NAT-LAN": elif mode == "NAT-LAN":
upstream_port = self.upstream_port() upstream_port = self.lan_upstream_port()
elif mode == "VLAN": elif mode == "VLAN":
# for vlan mode vlan id should be available # for vlan mode vlan id should be available
if vlan_id is not None: if vlan_id is not None:
upstream_port = self.upstream_port() + "." + str(vlan_id) upstream_port = self.wan_upstream_port() + "." + str(vlan_id)
else: else:
logging.error("Vlan id is not available for vlan") logging.error("Vlan id is not available for vlan")
pytest.exit("Vlan id is not available for vlan") pytest.exit("Vlan id is not available for vlan")
@@ -695,13 +695,22 @@ class lf_libs:
else: else:
logging.error("Name is not provided") logging.error("Name is not provided")
def upstream_port(self): def wan_upstream_port(self):
"""finding upstream port""" """finding upstream port"""
upstream_port = "" upstream_port = ""
for i in self.dut_data: for i in self.dut_data:
if dict(i).keys().__contains__("wan_port"):
upstream_port = i["wan_port"] upstream_port = i["wan_port"]
return upstream_port return upstream_port
def lan_upstream_port(self):
"""finding upstream port"""
upstream_port = ""
for i in self.dut_data:
if dict(i).keys().__contains__("lan_port"):
upstream_port = i["lan_port"]
return upstream_port
def setup_sniffer(self, band=None, station_radio_data=None): def setup_sniffer(self, band=None, station_radio_data=None):
"""Setup sniff radio""" """Setup sniff radio"""
sniff_radio = None sniff_radio = None

8
lf_libs/lf_tests.py
View File

@@ -75,8 +75,12 @@ class lf_tests(lf_libs):
obj_sta_connect = StaConnect2(self.manager_ip, self.manager_http_port, outfile="shivam", obj_sta_connect = StaConnect2(self.manager_ip, self.manager_http_port, outfile="shivam",
_cleanup_on_exit=False) _cleanup_on_exit=False)
obj_sta_connect.sta_mode = 0 obj_sta_connect.sta_mode = 0
obj_sta_connect.upstream_resource = data["upstream_port"].split(".")[1] upstream_data = list(data["upstream_port"].split("."))
obj_sta_connect.upstream_port = data["upstream_port"].split(".")[2] obj_sta_connect.upstream_resource = upstream_data[1]
upstream_data.pop(0)
upstream_data.pop(0)
upstream_port = ".".join(upstream_data)
obj_sta_connect.upstream_port = upstream_port
self.enable_verbose_debug(radio=radio, enable=False) self.enable_verbose_debug(radio=radio, enable=False)
obj_sta_connect.radio = radio obj_sta_connect.radio = radio
obj_sta_connect.admin_down(obj_sta_connect.radio) obj_sta_connect.admin_down(obj_sta_connect.radio)