From 7aa04ecbc3c4185814c8f7f9e2e2e12bc9987777 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Wed, 1 Dec 2021 15:59:42 -0700 Subject: [PATCH] lf_check.py ct_001_AX88U_dut.json: pass in serial number fix ct_us_001_tests.json test update Signed-off-by: Chuck SmileyRekiere --- py-scripts/tools/ct_001_AX88U_dut.json | 3 +++ py-scripts/tools/ct_us_001_tests.json | 3 ++- py-scripts/tools/lf_check.py | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/py-scripts/tools/ct_001_AX88U_dut.json b/py-scripts/tools/ct_001_AX88U_dut.json index 28aff673..691d2a4e 100644 --- a/py-scripts/tools/ct_001_AX88U_dut.json +++ b/py-scripts/tools/ct_001_AX88U_dut.json @@ -9,6 +9,9 @@ "test_dut":{ "DUT_SET_NAME": "DUT_NAME ASUSRT-AX88U", "USE_DUT_NAME": "ASUSRT-AX88U", + "DUT_SW": "3.0.0.4.386_44266", + "DUT_HW": "1.0", + "DUT_SN": "12345678", "wireless_network_dict":{ "ssid_idx=0":{"ssid_idx":"0","SSID_USED":"asus11ax-2","SSID_PW_USED":"hello123","BSSID":"3c:7c:3f:55:4d:60","SECURITY_USED":"wpa2"}, "ssid_idx=1":{"ssid_idx":"1","SSID_USED":"asus11ax-5","SSID_PW_USED":"hello123","BSSID":"3c:7c:3f:55:4d:64","SECURITY_USED":"wpa2"} diff --git a/py-scripts/tools/ct_us_001_tests.json b/py-scripts/tools/ct_us_001_tests.json index 10e27ae0..9c36d48d 100644 --- a/py-scripts/tools/ct_us_001_tests.json +++ b/py-scripts/tools/ct_us_001_tests.json @@ -26,7 +26,8 @@ " --lfmgr LF_MGR_IP --local_lf_report_dir REPORT_PATH --test_duration 15s --polling_interval 5s --upstream_port eth2 ", " use_ssid_idx=1 --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED' ", " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000", - " --test_rig TEST_RIG --test_tag 'l3_longevity'" + " --test_rig TEST_RIG --test_tag 'l3_longevity'", + " --dut_model_num USE_DUT_NAME --dut_sw_version DUT_SW --dut_hw_version DUT_HW --dut_serial_num DUT_SN" ] }, "lf_qa":{ diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 7b9f0656..302e0cea 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -211,7 +211,7 @@ class lf_check(): self.dut_hw = "DUT_HW_NA" self.dut_sw = "DUT_SW_NA" self.dut_model = "DUT_MODEL_NA" - self.dut_serial = "DUT_SERIAL_NA" + self.dut_serial = "DUT_SN_NA" self.dut_wireless_network_dict = {} @@ -664,8 +664,8 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url) else: self.logger.info("DUT_MODEL not in test_dut json") - if "DUT_SERIAL" in self.json_dut["test_dut"]: - self.dut_serial = self.json_dut["test_dut"]["DUT_SERIAL"] + if "DUT_SN" in self.json_dut["test_dut"]: + self.dut_serial = self.json_dut["test_dut"]["DUT_SN"] else: self.logger.info("DUT_SERIAL not in test_dut json") @@ -819,9 +819,9 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url) if 'DUT_MODEL' in self.test_dict[test]['args']: self.test_dict[test]['args'] = self.test_dict[test]['args'].replace( 'DUT_MODEL', self.dut_model) - if 'DUT_SERIAL' in self.test_dict[test]['args']: + if 'DUT_SN' in self.test_dict[test]['args']: self.test_dict[test]['args'] = self.test_dict[test]['args'].replace( - 'DUT_SERIAL', self.dut_serial) + 'DUT_SN', self.dut_serial) if 'UPSTREAM_PORT' in self.test_dict[test]['args']: self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('UPSTREAM_PORT',