diff options
author | Linda Wang <wangwulin@huawei.com> | 2017-06-29 10:06:19 +0000 |
---|---|---|
committer | Cedric Ollivier <cedric.ollivier@orange.com> | 2017-07-05 14:30:04 +0000 |
commit | 11ef4c749460411d25777bdd3e447fc03af65208 (patch) | |
tree | 2051473f012149c32ecb450fb32901ccd820922b /functest/opnfv_tests/openstack/refstack_client | |
parent | b4cacd1ca87b7cbe7c166a543e8f448b723c837d (diff) |
Enable refstack work on https without SSL checks
When refstack is run in https environment, SSL checks
will be skipped if no cacert file is provided.
JIRA: FUNCTEST-828
Change-Id: Ib44582b4f2f508c7a255a1510dbdc33110fe0f14
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/refstack_client')
-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" |