From b2917cca6c26d1e5931ddd1cfc71c4862287e453 Mon Sep 17 00:00:00 2001 From: karthikaeyetea Date: Thu, 20 Oct 2022 13:42:23 +0530 Subject: [PATCH] pass VLAN as a list Signed-off-by: karthikaeyetea --- lf_libs/lf_tests.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lf_libs/lf_tests.py b/lf_libs/lf_tests.py index 0a2c4e85..31d5c0d5 100644 --- a/lf_libs/lf_tests.py +++ b/lf_libs/lf_tests.py @@ -74,7 +74,7 @@ class lf_tests(lf_libs): attachment_type=allure.attachment_type.JSON) 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, dut_data_=dut_data) + band=band, vlan_id=vlan_id, mode=mode, num_sta=num_sta, dut_data_=dut_data) 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), attachment_type=allure.attachment_type.JSON) @@ -319,7 +319,7 @@ 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[0], 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) 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), @@ -463,14 +463,14 @@ class lf_tests(lf_libs): pass_fail_result = [] for obj in eap_connect_objs: sta_rows = ["4way time (us)", "channel", "cx time (us)", "dhcp (ms)", "ip", "signal"] - station_data = self.get_station_data(sta_name=obj.sta_list, rows=sta_rows, + self.station_data = self.get_station_data(sta_name=obj.sta_list, rows=sta_rows, allure_attach=False) sta_table_dict = {} - sta_table_dict["station name"] = list(station_data.keys()) + sta_table_dict["station name"] = list(self.station_data.keys()) for i in sta_rows: temp_list = [] for j in obj.sta_list: - temp_list.append(station_data[j][i]) + temp_list.append(self.station_data[j][i]) sta_table_dict[i] = temp_list # pass fail pass_fail_sta = [] @@ -695,7 +695,7 @@ class lf_tests(lf_libs): dut_data = self.run_lf_dut_data() data = self.setup_interfaces(ssid=ssid, passkey=passkey, encryption=security, - band=band, vlan_id=vlan_id[0], 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) 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), @@ -990,7 +990,7 @@ class lf_tests(lf_libs): logging.error("VLAN ID is Unspecified in the VLAN Case") pytest.skip("VLAN ID is Unspecified in the VLAN Case") else: - vlan_raw_lines = self.add_vlan(vlan_ids=[vlan_id], build=True) + vlan_raw_lines = self.add_vlan(vlan_ids=vlan_id, build=True) ret = self.get_wan_upstream_ports() upstream_port = ret[identifier] + "." + str(vlan_id) logging.info("Upstream data: " + str(upstream_port)) @@ -1124,7 +1124,7 @@ class lf_tests(lf_libs): logging.error("VLAN ID is Unspecified in the VLAN Case") pytest.skip("VLAN ID is Unspecified in the VLAN Case") else: - self.add_vlan(vlan_ids=[vlan_id]) + self.add_vlan(vlan_ids=vlan_id) ret = self.get_wan_upstream_ports() upstream_port = ret[identifier] + "." + str(vlan_id) logging.info("Upstream data: " + str(upstream_port))