diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-16 16:22:33 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-16 17:44:36 +0100 |
commit | e093264d4ceee7e09471c738055638eb6f86d17a (patch) | |
tree | 1c5a20f5d84e5001ea1ef8897deefbf673bc3758 /sfc/lib/config.py | |
parent | 8346170ebffc6407252513a39affa53fc1f45a81 (diff) |
Switch from CONST to env.get()
env.get() ensures that default values are reused if unset.
It also avoids desynchronization between os.environ and CONST.
It follows the change "Get properly env vars or their default values"
[1] applied in Functest.
It also fixes minor issues on shebangs and takes several pylint rules
into account in this module:
- http://pylint-messages.wikidot.com/messages:w0702
- https://www.python.org/dev/peps/pep-0282/
[1] https://gerrit.opnfv.org/gerrit/#/c/52221/
Change-Id: Ia7ad168b2cbbade8ea3890fb95dc01bcdfc50468
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'sfc/lib/config.py')
-rw-r--r-- | sfc/lib/config.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/sfc/lib/config.py b/sfc/lib/config.py index 7fb42e3e..49cebc7d 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -8,16 +8,18 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import logging import os import yaml -import sfc import functest -import sfc.lib.test_utils as test_utils from functest.utils.constants import CONST -import logging +from functest.utils import env import functest.utils.functest_utils as ft_utils +import sfc +import sfc.lib.test_utils as test_utils + logger = logging.getLogger(__name__) @@ -41,16 +43,16 @@ class CommonConfig(object): self.sfc_test_dir, "vnfd-default-params-file") self.vnffgd_dir = os.path.join(self.sfc_test_dir, "vnffgd-templates") self.functest_results_dir = os.path.join( - CONST.dir_results, "odl-sfc") - self.config_file = os.path.join(self.sfc_test_dir, "config.yaml") + getattr(CONST, 'dir_results'), "odl-sfc") + self.config_file = os.path.join(self.sfc_test_dir, "config.yaml") self.vim_file = os.path.join(self.sfc_test_dir, "register-vim.json") - self.installer_type = CONST.__getattribute__('INSTALLER_TYPE') + self.installer_type = env.get('INSTALLER_TYPE') self.installer_fields = test_utils.fill_installer_dict( - self.installer_type) + self.installer_type) - self.installer_ip = CONST.__getattribute__('INSTALLER_IP') + self.installer_ip = env.get('INSTALLER_IP') self.installer_user = ft_utils.get_parameter_from_yaml( self.installer_fields['user'], self.config_file) @@ -58,19 +60,19 @@ class CommonConfig(object): try: self.installer_password = ft_utils.get_parameter_from_yaml( self.installer_fields['password'], self.config_file) - except: + except Exception: self.installer_password = None try: self.installer_key_file = ft_utils.get_parameter_from_yaml( self.installer_fields['pkey_file'], self.config_file) - except: + except Exception: self.installer_key_file = None try: self.installer_cluster = ft_utils.get_parameter_from_yaml( self.installer_fields['cluster'], self.config_file) - except: + except Exception: self.installer_cluster = None self.flavor = ft_utils.get_parameter_from_yaml( @@ -104,7 +106,8 @@ class TestcaseConfig(object): testcases_yaml = yaml.safe_load(f) test_config = testcases_yaml['testcases'].get(testcase, None) if test_config is None: - logger.error('Test {0} configuration is not present in {1}' - .format(testcase, common_config.config_file)) + logger.error( + 'Test %s configuration is not present in %s', + testcase, common_config.config_file) # Update class fields with configuration variables dynamically self.__dict__.update(**test_config) |