From 55db4b8b963dcd1296145d520683048f6e6b53e6 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Fri, 19 Nov 2021 13:33:57 -0700 Subject: [PATCH] test_l3_longevity.py : pass in the dut information lf_qa.py : bug fix for serial number Signed-off-by: Chuck SmileyRekiere --- py-scripts/test_l3_longevity.py | 6 ++++++ py-scripts/tools/lf_check.py | 10 +++++----- py-scripts/tools/lf_qa.py | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/py-scripts/test_l3_longevity.py b/py-scripts/test_l3_longevity.py index 9a9cae77..86054132 100755 --- a/py-scripts/test_l3_longevity.py +++ b/py-scripts/test_l3_longevity.py @@ -2545,6 +2545,10 @@ Setting wifi_settings per radio "--dut_model_num", default="", help="dut model for kpi.csv, model number / name of the device under test") + parser.add_argument( + "--dut_serial_num", + default="", + help="dut serial for kpi.csv, serial number / serial number of the device under test") parser.add_argument( "--test_priority", default="", @@ -2764,6 +2768,7 @@ Setting wifi_settings per radio dut_hw_version = args.dut_hw_version dut_sw_version = args.dut_sw_version dut_model_num = args.dut_model_num + dut_serial_num = args.dut_serial_num # test_priority = args.test_priority # this may need to be set per test test_id = args.test_id @@ -2870,6 +2875,7 @@ Setting wifi_settings per radio _kpi_dut_hw_version=dut_hw_version, _kpi_dut_sw_version=dut_sw_version, _kpi_dut_model_num=dut_model_num, + _kpi_dut_serial_num=dut_serial_num, _kpi_test_id=test_id) if args.csv_outfile is not None: diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 55e87517..df5b4fc4 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -874,8 +874,8 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url) self.test_start_time = str(datetime.datetime.now().strftime( "%Y-%m-%d-%H-%M-%S")).replace(':', '-') print( - "Test start: {time}".format( - time=self.test_start_time)) + "Test start: {time} Timeout: {timeout}".format( + time=self.test_start_time,timeout=self.test_timeout)) start_time = datetime.datetime.now() try: process = subprocess.Popen(command_to_run, shell=False, stdout=stdout_log, stderr=stderr_log, @@ -1099,9 +1099,9 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url) # self.logger.info("row: {}".format(row)) self.logger.info("test: {} executed".format(test)) - else: - self.logger.info( - "enable value {} invalid for test: {}, test skipped".format(self.test_dict[test]['enabled'], test)) + else: + self.logger.info( + "enable value {} for test: {} ".format(self.test_dict[test]['enabled'], test)) self.finish_html_results() diff --git a/py-scripts/tools/lf_qa.py b/py-scripts/tools/lf_qa.py index 0000ffc9..b309cad8 100755 --- a/py-scripts/tools/lf_qa.py +++ b/py-scripts/tools/lf_qa.py @@ -428,7 +428,7 @@ class csv_sql: self.dut_serial_num_list = list( set(list(df_tmp['dut-serial-num']))) if self.dut_serial_num_list[0] is not None: - self.dut_serial_num_ = self.dut_serial_num_list[0] + self.dut_serial_num = self.dut_serial_num_list[0] print( "In png DUT: {DUT} SW:{SW} HW:{HW} SN:{SN}" .format(