diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-06-26 14:41:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-26 14:41:07 +0000 |
| commit | 6efef3438c236ed0e522809c0c9acce5f0c81374 (patch) | |
| tree | 62e040adf9921df65b0b76a702778585738e331b /functest | |
| parent | 9c647d5ae17026e4d0b791553397d4d38acf66db (diff) | |
| parent | fc643af21d49d6c95ac5d70f9f2c4e8612678c61 (diff) | |
Merge "Make rally support https insecure deployment"
Diffstat (limited to 'functest')
| -rw-r--r-- | functest/tests/unit/utils/test_openstack_utils.py | 6 | ||||
| -rw-r--r-- | functest/utils/openstack_utils.py | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/functest/tests/unit/utils/test_openstack_utils.py b/functest/tests/unit/utils/test_openstack_utils.py index fa0e0f5e..74b49aaa 100644 --- a/functest/tests/unit/utils/test_openstack_utils.py +++ b/functest/tests/unit/utils/test_openstack_utils.py @@ -27,7 +27,8 @@ class OSUtilsTesting(unittest.TestCase): 'OS_PROJECT_NAME': os_prefix + 'project_name', 'OS_ENDPOINT_TYPE': os_prefix + 'endpoint_type', 'OS_REGION_NAME': os_prefix + 'region_name', - 'OS_CACERT': os_prefix + 'https_cacert'} + 'OS_CACERT': os_prefix + 'https_cacert', + 'OS_INSECURE': os_prefix + 'https_insecure'} def _get_os_env_vars(self): return {'username': 'test_username', 'password': 'test_password', @@ -37,7 +38,8 @@ class OSUtilsTesting(unittest.TestCase): 'project_name': 'test_project_name', 'endpoint_type': 'test_endpoint_type', 'region_name': 'test_region_name', - 'https_cacert': 'test_https_cacert'} + 'https_cacert': 'test_https_cacert', + 'https_insecure': 'test_https_insecure'} def setUp(self): self.env_vars = ['OS_AUTH_URL', 'OS_USERNAME', 'OS_PASSWORD'] diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py index a50bf179..e7cdfc86 100644 --- a/functest/utils/openstack_utils.py +++ b/functest/utils/openstack_utils.py @@ -82,7 +82,8 @@ def get_env_cred_dict(): 'OS_PROJECT_NAME': 'project_name', 'OS_ENDPOINT_TYPE': 'endpoint_type', 'OS_REGION_NAME': 'region_name', - 'OS_CACERT': 'https_cacert' + 'OS_CACERT': 'https_cacert', + 'OS_INSECURE': 'https_insecure' } return env_cred_dict @@ -150,10 +151,12 @@ def get_credentials_for_rally(): cred_key = env_cred_dict.get('OS_REGION_NAME') rally_conf[cred_key] = region_name - cacert = os.getenv('OS_CACERT') - if cacert is not None: - cred_key = env_cred_dict.get('OS_CACERT') - rally_conf[cred_key] = cacert + cred_key = env_cred_dict.get('OS_CACERT') + rally_conf[cred_key] = os.getenv('OS_CACERT', '') + + insecure_key = env_cred_dict.get('OS_INSECURE') + rally_conf[insecure_key] = os.getenv('OS_INSECURE', '').lower() == 'true' + return rally_conf |