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

Fixed upstream issue for dvlan

Browse Source 
Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
This commit is contained in:
jitendracandela
2024-11-14 20:51:45 +05:30
parent eaebd34bd1
commit 4038188265
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lf_libs/lf_libs.py
View File

@@ -433,7 +433,7 @@ class lf_libs:
logging.info("Saved default CV Scenario details: " + str(self.temp_raw_lines)) logging.info("Saved default CV Scenario details: " + str(self.temp_raw_lines))
def setup_interfaces(self, ssid="", bssid="", passkey="", encryption="", band=None, vlan_id=None, mode=None, def setup_interfaces(self, ssid="", bssid="", passkey="", encryption="", band=None, vlan_id=None, mode=None,
num_sta=None, dut_data_=None): num_sta=None, dut_data_=None, d_vlan=False):
logging.info("dut_data_ in setup_interfaces: " + str(dut_data_)) logging.info("dut_data_ in setup_interfaces: " + str(dut_data_))
if dut_data_ is None: if dut_data_ is None:
pytest.skip("No DUT data received") pytest.skip("No DUT data received")
@@ -500,6 +500,10 @@ class lf_libs:
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:
if d_vlan:
upstream_data = (ret[dut] + "." + str(vlan_id[1])).split(".")
r_val[dut]["upstream_port"] = ret[dut] + "." + str(vlan_id[1])
else:
upstream_data = (ret[dut] + "." + str(vlan_id[0])).split(".") upstream_data = (ret[dut] + "." + str(vlan_id[0])).split(".")
r_val[dut]["upstream_port"] = ret[dut] + "." + str(vlan_id[0]) r_val[dut]["upstream_port"] = ret[dut] + "." + str(vlan_id[0])
upstream_resource = upstream_data[1] upstream_resource = upstream_data[1]

3
lf_libs/lf_tests.py
View File

@@ -574,7 +574,8 @@ class lf_tests(lf_libs):
if self.run_lf: if self.run_lf:
dut_data = self.run_lf_dut_data() dut_data = self.run_lf_dut_data()
data = self.setup_interfaces(ssid=ssid, bssid=bssid, passkey=passkey, encryption=security, data = self.setup_interfaces(ssid=ssid, bssid=bssid, passkey=passkey, encryption=security,
band=band, vlan_id=vlan_id, mode=mode, num_sta=num_sta, dut_data_=dut_data) band=band, vlan_id=vlan_id, mode=mode, num_sta=num_sta, dut_data_=dut_data,
d_vlan=d_vlan)
logging.info("Setup interface data:\n" + json.dumps(str(data), indent=2)) logging.info("Setup interface data:\n" + json.dumps(str(data), indent=2))
allure.attach(name="Interface Info: \n", body=json.dumps(str(data), indent=2), allure.attach(name="Interface Info: \n", body=json.dumps(str(data), indent=2),