diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-12-19 09:23:04 +0000 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-13 07:44:30 +0100 |
| commit | 46f1037fe35bc249dca868b363107bc1bcd70469 (patch) | |
| tree | 17945ba4933704fbbaa7b5602a1442f42f1ca93a | |
| parent | 9e9e8c9b89fc7c419d1824190217897118800275 (diff) | |
Improve the way of setting values in CONST
Use setattr instead of internal method (__setattr__).
It must be completed by patches fixing [1] [2] and [3].
[1] https://jira.opnfv.org/browse/FUNCTEST-930
[2] https://jira.opnfv.org/browse/FUNCTEST-931
[3] https://jira.opnfv.org/browse/FUNCTEST-932
Change-Id: I9558f33f5ed4559b6031d75951d5637c0c0ef8cb
Signed-off-by: Linda Wang <wangwulin@huawei.com>
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 4 | ||||
| -rw-r--r-- | functest/utils/config.py | 2 | ||||
| -rw-r--r-- | functest/utils/constants.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 25cc758ea..6af49ffaf 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -38,7 +38,7 @@ __author__ = "Cedric Ollivier <cedric.ollivier@orange.com>" class ODLTests(robotframework.RobotFramework): """ODL test runner.""" - odl_test_repo = constants.CONST.__getattribute__('dir_repo_odl_test') + odl_test_repo = getattr(constants.CONST, 'dir_repo_odl_test') neutron_suite_dir = os.path.join( odl_test_repo, "csit/suites/openstack/neutron") basic_suite_dir = os.path.join( @@ -51,7 +51,7 @@ class ODLTests(robotframework.RobotFramework): def __init__(self, **kwargs): super(ODLTests, self).__init__(**kwargs) self.res_dir = os.path.join( - constants.CONST.__getattribute__('dir_results'), 'odl') + getattr(constants.CONST, 'dir_results'), 'odl') self.xml_file = os.path.join(self.res_dir, 'output.xml') @classmethod diff --git a/functest/utils/config.py b/functest/utils/config.py index 050f12a92..c569856b1 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 cb3ea7875..c19e0fc52 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() |