diff --git a/py-scripts/tools/ct_test_rig.json b/py-scripts/tools/ct_test_rig.json index 44178cfd..53343414 100644 --- a/py-scripts/tools/ct_test_rig.json +++ b/py-scripts/tools/ct_test_rig.json @@ -14,10 +14,6 @@ "LF_MGR_PASS": "lanforge", "UPSTREAM_PORT":"1.1.eth2", "TEST_TIMEOUT": 600, - "LOAD_BLANK_DB": false, - "LOAD_FACTORY_DEFAULT_DB": false, - "LOAD_CUSTOM_DB": false, - "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "support@candelatech.com", "EMAIL_LIST_TEST": "support@candelatech.com", "EMAIL_TITLE_TXT": "Lanforge QA Testing", diff --git a/py-scripts/tools/ct_us_001_rig.json b/py-scripts/tools/ct_us_001_rig.json index 092017d7..ef67ceed 100644 --- a/py-scripts/tools/ct_us_001_rig.json +++ b/py-scripts/tools/ct_us_001_rig.json @@ -14,10 +14,6 @@ "LF_MGR_PASS": "lanforge", "UPSTREAM_PORT":"1.1.eth2", "TEST_TIMEOUT": 600, - "LOAD_BLANK_DB": false, - "LOAD_FACTORY_DEFAULT_DB": false, - "LOAD_CUSTOM_DB": false, - "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com", "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com", "EMAIL_TITLE_TXT": "Lanforge QA Testing CT-US-001", diff --git a/py-scripts/tools/ct_us_002_rig.json b/py-scripts/tools/ct_us_002_rig.json index a145500b..43819d0d 100644 --- a/py-scripts/tools/ct_us_002_rig.json +++ b/py-scripts/tools/ct_us_002_rig.json @@ -14,10 +14,6 @@ "LF_MGR_PASS": "lanforge", "UPSTREAM_PORT": "1.1.eth2", "TEST_TIMEOUT": 600, - "LOAD_BLANK_DB": false, - "LOAD_FACTORY_DEFAULT_DB": true, - "LOAD_CUSTOM_DB": false, - "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com", "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com", "EMAIL_TITLE_TXT": "Lanforge QA Testing CT-US-002", diff --git a/py-scripts/tools/ct_us_003_rig.json b/py-scripts/tools/ct_us_003_rig.json index 4bc7b556..053ea38f 100644 --- a/py-scripts/tools/ct_us_003_rig.json +++ b/py-scripts/tools/ct_us_003_rig.json @@ -14,10 +14,6 @@ "LF_MGR_PASS": "lanforge", "UPSTREAM_PORT":"1.1.eth1", "TEST_TIMEOUT": 600, - "LOAD_BLANK_DB": false, - "LOAD_FACTORY_DEFAULT_DB": false, - "LOAD_CUSTOM_DB": false, - "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com", "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com", "EMAIL_TITLE_TXT": "Lanforge QA Testing CT-US-003", diff --git a/py-scripts/tools/ct_us_004_rig.json b/py-scripts/tools/ct_us_004_rig.json index 61cc0075..6d386d46 100644 --- a/py-scripts/tools/ct_us_004_rig.json +++ b/py-scripts/tools/ct_us_004_rig.json @@ -14,10 +14,6 @@ "LF_MGR_PASS": "lanforge", "UPSTREAM_PORT": "1.1.eth2", "TEST_TIMEOUT": 300, - "LOAD_BLANK_DB": false, - "LOAD_FACTORY_DEFAULT_DB": true, - "LOAD_CUSTOM_DB": false, - "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com", "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com", "EMAIL_TITLE_TXT": "Lanforge QA Testing CT-US-004", diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 2bb458f6..bad307ec 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -597,15 +597,15 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url) self.logger.info("failed to change to {}".format(self.scripts_wd)) # no spaces after FACTORY_DFLT - command = "./{} {}".format("scenario.py", "--load {}".format(custom_db)) + command = "./scenario.py --mgr {mgr} --load {db} --action {action}".format(mgr=self.lf_mgr_ip,db=custom_db,action="overwrite") process = subprocess.Popen((command).split(' '), shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) # wait for the process to terminate out, err = process.communicate() errcode = process.returncode - print("load_custome_database errcode: {errcode}".format(errcode=errcode)) + print("load_custom_database out: {out} errcode: {errcode} err: {err}".format(out=out,errcode=errcode,err=err)) # DO NOT REMOVE 15 second sleep. - # After every DB load, the loed changes are applied, and part of the apply is to re-build + # After every DB load, the load changes are applied, and part of the apply is to re-build # The underlying netsmith objects sleep(15)