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

lf_qa.py : fixed paths in report when not running with a server

Browse Source 
lf_check.py : added --server input and TEST_SERVER parameter

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-11-17 06:15:23 -07:00
parent c5f08b9c50
commit 7261a9f032
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
py-scripts/tools/ct_us_001_tests.json
View File

@@ -36,7 +36,7 @@
"command":"./tools/lf_qa.py", "command":"./tools/lf_qa.py",
"args":"", "args":"",
"args_list":[ "args_list":[
" --path REPORT_PATH --store --png --database DATABASE_SQLITE" " --server TEST_SERVER --path REPORT_PATH --store --png --database DATABASE_SQLITE"
] ]
} }
}, },
@@ -63,7 +63,7 @@
"command":"./tools/lf_qa.py", "command":"./tools/lf_qa.py",
"args":"", "args":"",
"args_list":[ "args_list":[
" --path REPORT_PATH --store --png --database DATABASE_SQLITE" " --server 'http://192.168.95.6/' --path REPORT_PATH --store --png --database DATABASE_SQLITE"
] ]
} }
}, },

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

@@ -131,6 +131,7 @@ class lf_check():
_json_dut, _json_dut,
_json_test, _json_test,
_test_suite, _test_suite,
_test_server,
_db_override, _db_override,
_production, _production,
_csv_results, _csv_results,
@@ -142,6 +143,7 @@ class lf_check():
self.json_dut = _json_dut self.json_dut = _json_dut
self.json_test = _json_test self.json_test = _json_test
self.test_suite = _test_suite self.test_suite = _test_suite
self.test_server = _test_server
self.db_override = _db_override self.db_override = _db_override
self.production_run = _production self.production_run = _production
self.report_path = _report_path self.report_path = _report_path
@@ -797,6 +799,10 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url)
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace( self.test_dict[test]['args'] = self.test_dict[test]['args'].replace(
'REPORT_PATH', self.report_path) 'REPORT_PATH', self.report_path)
if 'TEST_SERVER' in self.test_dict[test]['args']:
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace(
'TEST_SERVER', self.test_server)
if 'DUT_SET_NAME' in self.test_dict[test]['args']: if 'DUT_SET_NAME' in self.test_dict[test]['args']:
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('DUT_SET_NAME', self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('DUT_SET_NAME',
self.dut_set_name) self.dut_set_name)
@@ -1145,6 +1151,10 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
'--suite', '--suite',
help="--suite <suite name> default TEST_DICTIONARY", help="--suite <suite name> default TEST_DICTIONARY",
default="TEST_DICTIONARY") default="TEST_DICTIONARY")
parser.add_argument(
'--server',
help="--server http://<server ip>/ example: http://192.168.95.6/ default: ''",
default='')
parser.add_argument( parser.add_argument(
'--db_override', '--db_override',
help="--db_override <sqlite db> override for json DATABASE_SQLITE''", help="--db_override <sqlite db> override for json DATABASE_SQLITE''",
@@ -1191,6 +1201,9 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
# select test suite # select test suite
test_suite = args.suite test_suite = args.suite
test_server = args.server
__dir = args.dir __dir = args.dir
__path = args.path __path = args.path
@@ -1222,6 +1235,7 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
_json_dut=json_dut, _json_dut=json_dut,
_json_test=json_test, _json_test=json_test,
_test_suite=test_suite, _test_suite=test_suite,
_test_server=test_server,
_db_override=db_override, _db_override=db_override,
_production=production, _production=production,
_csv_results=csv_results, _csv_results=csv_results,

6
py-scripts/tools/lf_qa.py
View File

@@ -28,7 +28,7 @@ class csv_sql:
_file='kpi.csv', _file='kpi.csv',
_database='qa_db', _database='qa_db',
_table='qa_table', _table='qa_table',
_server='http://192.168.95.6/', _server='',
_cut='/home/lanforge/', _cut='/home/lanforge/',
_png=False): _png=False):
self.path = _path self.path = _path
@@ -544,8 +544,8 @@ Usage: lf_qa.py --store --png --path <path to directories to traverse> --databas
default='qa_table') default='qa_table')
parser.add_argument( parser.add_argument(
'--server', '--server',
help='--server http://<server ip>/ default: http://192.168.95.6/', help="--server http://<server ip>/ example: http://192.168.95.6/ default: ''",
default='http://192.168.95.6/') default='')
parser.add_argument( parser.add_argument(
'--cut', '--cut',
help='--cut /home/lanforge/ used to adjust server path default: /home/lanforge/', help='--cut /home/lanforge/ used to adjust server path default: /home/lanforge/',