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>
import copy
import logging
import copy
import logging
import unittest
import mock
from functest.utils import openstack_utils
import unittest
import mock
from functest.utils import openstack_utils
-from functest.utils.constants import CONST
class OSUtilsTesting(unittest.TestCase):
class OSUtilsTesting(unittest.TestCase):
def test_create_tenant_default(self):
with mock.patch('functest.utils.openstack_utils.'
'is_keystone_v3', return_value=True):
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',
self.assertEqual(openstack_utils.
create_tenant(self.keystone_client,
'test_tenant',
def create_tenant(keystone_client, tenant_name, tenant_description):
try:
if is_keystone_v3():
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,
domain_id = get_domain_id(keystone_client, domain_name)
tenant = keystone_client.projects.create(
name=tenant_name,