diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-02-13 06:01:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-13 06:01:13 +0000 |
| commit | b1522c34d95f9bb48fc9cfca91f281da2f958953 (patch) | |
| tree | 66cf229aad9d6109283eecc70334853634251988 | |
| parent | 67706058e7627cd3109e141caf6901be34922910 (diff) | |
| parent | e7eee58cd132f4f68cdf3e319bae6b0283fd2678 (diff) | |
Merge "Export env vars via os.environ in test_openstack_utils.py"
| -rw-r--r-- | functest/tests/unit/utils/test_openstack_utils.py | 4 | ||||
| -rw-r--r-- | functest/utils/openstack_utils.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/functest/tests/unit/utils/test_openstack_utils.py b/functest/tests/unit/utils/test_openstack_utils.py index 0a7177fc4..259e60d5c 100644 --- a/functest/tests/unit/utils/test_openstack_utils.py +++ b/functest/tests/unit/utils/test_openstack_utils.py @@ -9,12 +9,12 @@ import copy import logging +import os import unittest import mock from functest.utils import openstack_utils -from functest.utils.constants import CONST class OSUtilsTesting(unittest.TestCase): @@ -1577,7 +1577,7 @@ class OSUtilsTesting(unittest.TestCase): def test_create_tenant_default(self): with mock.patch('functest.utils.openstack_utils.' 'is_keystone_v3', return_value=True): - CONST.__setattr__('OS_PROJECT_DOMAIN_NAME', 'Default') + os.environ['OS_PROJECT_DOMAIN_NAME'] = 'Default' self.assertEqual(openstack_utils. create_tenant(self.keystone_client, 'test_tenant', diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py index f7069a633..b779997c9 100644 --- a/functest/utils/openstack_utils.py +++ b/functest/utils/openstack_utils.py @@ -1320,7 +1320,7 @@ def get_domain_id(keystone_client, domain_name): def create_tenant(keystone_client, tenant_name, tenant_description): try: if is_keystone_v3(): - domain_name = CONST.__getattribute__('OS_PROJECT_DOMAIN_NAME') + domain_name = os.environ['OS_PROJECT_DOMAIN_NAME'] domain_id = get_domain_id(keystone_client, domain_name) tenant = keystone_client.projects.create( name=tenant_name, |