summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-02-12 11:22:06 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-02-12 11:22:06 +0100
commite7eee58cd132f4f68cdf3e319bae6b0283fd2678 (patch)
treeca0dc4317c0b2c8ca5eb2e79597c36dde86c22cc
parent8d83b91049f4b2f3da6b77d39105a2213a8ce690 (diff)
Export env vars via os.environ in test_openstack_utils.py
CONST shouldn't be used for getting/setting env vars. It adds complexity and may raise side effects. Change-Id: I8319748dd2f0abb95b82a2f65191cac8ccba7f5e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/tests/unit/utils/test_openstack_utils.py4
-rw-r--r--functest/utils/openstack_utils.py2
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,