diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-12-18 07:38:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-18 07:38:31 +0000 |
| commit | 0d71ebc2ddc07f92d1ca1901c3fec53ff1a3af84 (patch) | |
| tree | 5ecfa2cb855b3a74a09d0644b93f60c8cf31d116 | |
| parent | 62d12c838b7c008462b7c45731290c385ed98bff (diff) | |
| parent | 6a2ee8883daf1795ec84fc2868c17c0723025447 (diff) | |
Merge "Inject all envs in openrc into CONST"
| -rw-r--r-- | functest/ci/run_tests.py | 13 | ||||
| -rw-r--r-- | functest/utils/openstack_utils.py | 1 |
2 files changed, 1 insertions, 13 deletions
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index 481931695..166dbfc9e 100644 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -25,7 +25,6 @@ import textwrap import pkg_resources import prettytable -import six import functest.ci.tier_builder as tb import functest.core.testcase as testcase @@ -108,18 +107,6 @@ class Runner(object): raise Exception("RC file %s does not exist..." % rc_file) LOGGER.debug("Sourcing the OpenStack RC file...") os_utils.source_credentials(rc_file) - for key, value in six.iteritems(os.environ): - if re.search("OS_", key): - if key == 'OS_AUTH_URL': - CONST.__setattr__('OS_AUTH_URL', value) - elif key == 'OS_USERNAME': - CONST.__setattr__('OS_USERNAME', value) - elif key == 'OS_TENANT_NAME': - CONST.__setattr__('OS_TENANT_NAME', value) - elif key == 'OS_PASSWORD': - CONST.__setattr__('OS_PASSWORD', value) - elif key == "OS_PROJECT_DOMAIN_NAME": - CONST.__setattr__('OS_PROJECT_DOMAIN_NAME', value) @staticmethod def get_run_dict(testname): diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py index b479198d2..1d7cdafb9 100644 --- a/functest/utils/openstack_utils.py +++ b/functest/utils/openstack_utils.py @@ -127,6 +127,7 @@ def source_credentials(rc_file): key = re.sub(r'^["\' ]*|[ \'"]*$', '', var[0]) value = re.sub(r'^["\' ]*|[ \'"]*$', '', "".join(var[1:])) os.environ[key] = value + CONST.__setattr__(key, value) def get_session_auth(other_creds={}): |