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

lf_check.py : added the ability to use the lf_report path name to be passed

Browse Source 
in a report

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-06-29 06:03:50 -06:00
parent eca0e61e19
commit 99736ceaaa
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
py-scripts/tools/lf_check.py
View File

@@ -80,12 +80,14 @@ class lf_check():
_test_suite, _test_suite,
_production, _production,
_csv_results, _csv_results,
_outfile): _outfile,
_report_path):
self.use_json = _use_json self.use_json = _use_json
self.json_data = _json_data self.json_data = _json_data
self.config_ini = _config_ini self.config_ini = _config_ini
self.test_suite = _test_suite self.test_suite = _test_suite
self.production_run = _production self.production_run = _production
self.report_path = _report_path
self.lf_mgr_ip = "" self.lf_mgr_ip = ""
self.lf_mgr_port = "" self.lf_mgr_port = ""
self.radio_dict = {} self.radio_dict = {}
@@ -552,6 +554,11 @@ NOTE: for now to see stdout and stderr remove /home/lanforge from path.
if 'UPSTREAM_PORT' in self.test_dict[test]['args']: if 'UPSTREAM_PORT' in self.test_dict[test]['args']:
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('UPSTREAM_PORT',self.col_names) self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('UPSTREAM_PORT',self.col_names)
# lf_dataplane_test.py and lf_wifi_capacity_test.py use a parameter --local_path for the location
# of the reports when the reports are pulled.
if 'REPORT_PATH' in self.test_dict[test]['args']:
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('REPORT_PATH',self.report_path)
if 'load_db' in self.test_dict[test]: if 'load_db' in self.test_dict[test]:
self.logger.info("load_db : {}".format(self.test_dict[test]['load_db'])) self.logger.info("load_db : {}".format(self.test_dict[test]['load_db']))
if str(self.test_dict[test]['load_db']).lower() != "none" and str(self.test_dict[test]['load_db']).lower() != "skip": if str(self.test_dict[test]['load_db']).lower() != "none" and str(self.test_dict[test]['load_db']).lower() != "skip":
@@ -729,6 +736,7 @@ Example :
csv_results = report.file_add_path(csv_results) csv_results = report.file_add_path(csv_results)
outfile = "lf_check-{}-{}".format(args.outfile,current_time) outfile = "lf_check-{}-{}".format(args.outfile,current_time)
outfile_path = report.file_add_path(outfile) outfile_path = report.file_add_path(outfile)
report_path = report.get_report_path()
# lf_check() class created # lf_check() class created
check = lf_check(_use_json = use_json, check = lf_check(_use_json = use_json,
@@ -737,7 +745,8 @@ Example :
_test_suite = test_suite, _test_suite = test_suite,
_production = production, _production = production,
_csv_results = csv_results, _csv_results = csv_results,
_outfile = outfile_path) _outfile = outfile_path,
_report_path = report_path)
# get git sha # get git sha
process = subprocess.Popen(["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE) process = subprocess.Popen(["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE)