lf_check.py : debugging , separate json for rig, tests

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-08-15 10:52:39 -06:00
parent d0c5566f41
commit 367262271f
2 changed files with 5 additions and 4 deletions

View File

@@ -11,6 +11,7 @@
},
"test_parameters":{
"test_bed": "CT-US-001",
"test_rig": "CT-US-001",
"lf_mgr_ip": "192.168.100.116",
"lf_mgr_port": "8080",
"dut_name": "ASUSRT-AX88U",

View File

@@ -474,6 +474,10 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
#TODO change code so if parameter is not present then implied to be false
def read_test_parameters(self):
if "test_rig" in self.json_rig["test_parameters"]:
self.test_rig = self.json_rig["test_parameters"]["test_rig"]
else:
self.logger.info("test_rig not in test_parameters json")
if "test_timeout" in self.json_rig["test_parameters"]:
self.test_timeout = self.json_rig["test_parameters"]["test_timeout"]
self.test_timeout_default = self.test_timeout
@@ -616,10 +620,6 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
self.database_tag = self.json_igg["test_database"]["database_tag"]
else:
self.logger.info("database_tag not in test_database json")
if "test_rig" in self.json_igg["test_database"]:
self.test_rig = self.json_igg["test_database"]["test_rig"]
else:
self.logger.info("test_rig not in test_database json")
if "dut_set_name" in self.json_igg["test_database"]:
self.dut_set_name = self.json_igg["test_database"]["dut_set_name"]
else: