diff options
| author |   xudan <xudan16@huawei.com> | 2017-09-28 02:28:51 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2017-09-28 23:47:39 -0400 |
| commit | eac5857502dfad79c9eaa735b88bd07f60fd537c (patch) | |
| tree | 974f09cbd076e7d642b6f25a8a623159eed4a7e1 /dovetail/container.py | |
| parent | 465f738554c1c401707036a055577b35f7c06dca (diff) | |
Bugfix: sdnvpn test cases failed due to wrong module name
SDNVPN test cases failed due to wrong module name.
The module name needs to be changed into "sdnvpn.test.functest.testcase_1"
Refer to patch https://gerrit.opnfv.org/gerrit/#/c/41385/
Currently Dovetail uses functest:cvp.0.5.0 which uses module name "testcase_1".
JIRA: DOVETAIL-510
Change-Id: I3232760d3af34125c7da71a5d2c62ca32693c82b
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/container.py')
| -rw-r--r-- | dovetail/container.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/dovetail/container.py b/dovetail/container.py index ff92fa4a..e8840de3 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -68,16 +68,20 @@ class Container(object): # These are all just used by Functest's function push_results_to_db. # And has nothing to do with DoveTail running test cases. - ins_type = os.getenv('INSTALLER_TYPE', "unknown") - scenario = os.getenv('DEPLOY_SCENARIO', "unknown") + ins_type = "unknown" + scenario = "unknown" ins_type = ''.join([" -e INSTALLER_TYPE=", ins_type]) scenario = ''.join([" -e DEPLOY_SCENARIO=", scenario]) + ins_ip = os.getenv('INSTALLER_IP', "192.168.0.0") + ins_ip = " -e INSTALLER_IP={}".format(ins_ip) # vpn testcase only runs when scenario name includes bgpvpn # functest requirements if 'sdnvpn' in testcase_name: - ins_type = "-e INSTALLER_TYPE=netvirt" - scenario = " -e DEPLOY_SCENARIO=bgpvpn" - envs = "%s %s" % (ins_type, scenario) + ins_type = os.getenv('INSTALLER_TYPE', "netvirt") + ins_type = " -e INSTALLER_TYPE={}".format(ins_type) + scenario = os.getenv('DEPLOY_SCENARIO', "bgpvpn") + scenario = " -e DEPLOY_SCENARIO={}".format(scenario) + envs = "%s %s %s" % (ins_type, scenario, ins_ip) dovetail_config = dt_cfg.dovetail_config if dovetail_config['report_dest'].startswith("http"): |