From b25c1371f82911ea26b8c893b6612bb5ae0c8c19 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Mar 2018 20:03:59 +0800 Subject: leverage data_files to eliminate so many hardcoded abs_path_seekings 1. mv conf/ userconfig/ compliance/ patch to etc/ 2. after installation etc/ will be put under /etc/dovetail 3. leveraging /etc/dovetail in coding Change-Id: Icf9cb00ff7fc7cf35755f60d3e258b23e2c70839 Signed-off-by: SerenaFeng --- dovetail/utils/dovetail_config.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'dovetail/utils') diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py index 5e100d69..d3b54192 100644 --- a/dovetail/utils/dovetail_config.py +++ b/dovetail/utils/dovetail_config.py @@ -16,18 +16,16 @@ class DovetailConfig(object): dovetail_config = {} @classmethod - def load_config_files(cls): - curr_path = os.path.dirname(os.path.abspath(__file__)) - config_path = os.path.join(os.path.dirname(curr_path), 'conf') - with open(os.path.join(config_path, 'dovetail_config.yml')) as f: + def load_config_files(cls, conf_path): + with open(os.path.join(conf_path, 'dovetail_config.yml')) as f: cls.dovetail_config = yaml.safe_load(f) for extra_config_file in cls.dovetail_config['include_config']: - with open(os.path.join(config_path, extra_config_file)) as f: + with open(os.path.join(conf_path, extra_config_file)) as f: extra_config = yaml.safe_load(f) cls.dovetail_config.update(extra_config) - path = os.path.join(config_path, cls.dovetail_config['cli_file_name']) + path = os.path.join(conf_path, cls.dovetail_config['cli_file_name']) with open(path) as f: cmd_yml = yaml.safe_load(f) cls.dovetail_config['cli'] = cmd_yml[cmd_yml.keys()[0]] -- cgit 1.2.3-korg