From 403818826572e19ff213ffa186d94dab1e14636d Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Thu, 14 Nov 2024 20:51:45 +0530 Subject: [PATCH] Fixed upstream issue for dvlan Signed-off-by: jitendracandela --- lf_libs/lf_libs.py | 10 +++++++--- lf_libs/lf_tests.py | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lf_libs/lf_libs.py b/lf_libs/lf_libs.py index a71807d9..0a79ab50 100644 --- a/lf_libs/lf_libs.py +++ b/lf_libs/lf_libs.py @@ -433,7 +433,7 @@ class lf_libs: 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, - 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_)) if dut_data_ is None: pytest.skip("No DUT data received") @@ -500,8 +500,12 @@ class lf_libs: ret = self.get_wan_upstream_ports() for dut in r_val: if ret.keys().__contains__(dut) and ret[dut] is not None: - upstream_data = (ret[dut] + "." + str(vlan_id[0])).split(".") - r_val[dut]["upstream_port"] = ret[dut] + "." + str(vlan_id[0]) + 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(".") + r_val[dut]["upstream_port"] = ret[dut] + "." + str(vlan_id[0]) upstream_resource = upstream_data[1] r_val[dut]["upstream_resource"] = upstream_resource upstream_data.pop(0) diff --git a/lf_libs/lf_tests.py b/lf_libs/lf_tests.py index dd135756..03444f88 100644 --- a/lf_libs/lf_tests.py +++ b/lf_libs/lf_tests.py @@ -574,7 +574,8 @@ class lf_tests(lf_libs): if self.run_lf: dut_data = self.run_lf_dut_data() 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)) allure.attach(name="Interface Info: \n", body=json.dumps(str(data), indent=2),