diff options
author | Linda Wang <wangwulin@huawei.com> | 2017-12-15 02:57:26 +0000 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-01-04 11:58:12 +0100 |
commit | 44cbd875b1f5b0b7950b4f6865b2ca01881532d0 (patch) | |
tree | 6fc8ab367b4a07900e20cc61870f46d1ccd0d148 | |
parent | 5e3bf15dfd827c41d6a52ad40711a8ec0fbe42f7 (diff) |
Inject all envs in openrc into CONST
After "env_prepare" is removed, some specific vars in openrc
(eg,."EXTERNAL_NETWORK") loaded to os.environ should be injected
into CONST in one python process.
Conflicts:
functest/ci/run_tests.py
Change-Id: Iaa5c6047033dc2a30c533174e2016111759aec31
Signed-off-by: Linda Wang <wangwulin@huawei.com>
(cherry picked from commit 6a2ee8883daf1795ec84fc2868c17c0723025447)
-rw-r--r-- | functest/ci/run_tests.py | 12 | ||||
-rw-r--r-- | functest/utils/openstack_utils.py | 1 |
2 files changed, 1 insertions, 12 deletions
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index d4acd9c56..8abd8e21c 100644 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -82,18 +82,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 os.environ.iteritems(): - 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 d8b1cf6f9..8a4ce2e36 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_credentials_for_rally(): |