diff options
Diffstat (limited to 'functest/utils')
| -rw-r--r-- | functest/utils/config.py | 2 | ||||
| -rw-r--r-- | functest/utils/constants.py | 4 | ||||
| -rw-r--r-- | functest/utils/env.py | 1 | ||||
| -rw-r--r-- | functest/utils/openstack_utils.py | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/functest/utils/config.py b/functest/utils/config.py index 050f12a9..c569856b 100644 --- a/functest/utils/config.py +++ b/functest/utils/config.py @@ -45,7 +45,7 @@ class Config(object): for param_n, param_v in six.iteritems(left_parametes): attr_further = self._get_attr_further(attr_now, param_n) if attr_further: - self.__setattr__(attr_further, param_v) + setattr(self, attr_further, param_v) if isinstance(param_v, dict): self._parse(attr_further, param_v) diff --git a/functest/utils/constants.py b/functest/utils/constants.py index cb3ea787..c19e0fc5 100644 --- a/functest/utils/constants.py +++ b/functest/utils/constants.py @@ -12,9 +12,9 @@ class Constants(object): # pylint: disable=too-few-public-methods def __init__(self): for attr_n, attr_v in six.iteritems(config.CONF.__dict__): - self.__setattr__(attr_n, attr_v) + setattr(self, attr_n, attr_v) for env_n, env_v in six.iteritems(env.ENV.__dict__): - self.__setattr__(env_n, env_v) + setattr(self, env_n, env_v) CONST = Constants() diff --git a/functest/utils/env.py b/functest/utils/env.py index f6e6e100..aaa5beac 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -13,7 +13,6 @@ class Environment(object): # pylint: disable=too-few-public-methods default_envs = { 'NODE_NAME': 'unknown_pod', - 'CI_DEBUG': 'false', 'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha', 'DEPLOY_TYPE': 'virt', 'INSTALLER_TYPE': None, diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py index f7069a63..b779997c 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, |