diff options
| author |   valentin boucher <valentin.boucher@orange.com> | 2017-07-05 15:45:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-05 15:45:15 +0000 |
| commit | f98bdab4d0d85d5470b9a014612109580ced9f5e (patch) | |
| tree | a10065fbb61b552f9db43e29d911c65a81f842b6 /functest/opnfv_tests/openstack | |
| parent | f524d0ab4bb36488a7fe68420f8de89b5a15d664 (diff) | |
| parent | 11ef4c749460411d25777bdd3e447fc03af65208 (diff) | |
Merge "Enable refstack work on https without SSL checks"
Diffstat (limited to 'functest/opnfv_tests/openstack')
| -rw-r--r-- | functest/opnfv_tests/openstack/refstack_client/refstack_client.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py index 9edbab5a..c2a05379 100644 --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -44,19 +44,20 @@ class RefstackClient(testcase.OSGCTestCase): self.CONF_PATH) self.defcorelist = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/refstack_client/defcore.txt') + self.insecure = '' + if ('https' in CONST.__getattribute__('OS_AUTH_URL') and + CONST.__getattribute__('OS_INSECURE').lower() == 'true'): + self.insecure = '-k' def run_defcore(self, conf, testlist): - logger.debug("Generating test case list...") - - cmd = ("refstack-client test -c {0} -v --test-list {1}" - .format(conf, testlist)) + cmd = ("refstack-client test {0} -c {1} -v --test-list {2}" + .format(self.insecure, conf, testlist)) + logger.info("Starting Refstack_defcore test case: '%s'." % cmd) ft_utils.execute_command(cmd) def run_defcore_default(self): - logger.debug("Generating test case list...") - - cmd = ("refstack-client test -c {0} -v --test-list {1}" - .format(self.confpath, self.defcorelist)) + cmd = ("refstack-client test {0} -c {1} -v --test-list {2}" + .format(self.insecure, self.confpath, self.defcorelist)) logger.info("Starting Refstack_defcore test case: '%s'." % cmd) header = ("Refstack environment:\n" |