diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2018-03-01 20:03:59 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2018-03-06 09:16:43 +0800 |
| commit | b25c1371f82911ea26b8c893b6612bb5ae0c8c19 (patch) | |
| tree | 91190d32b9bb723670214b4d91e0bb95cccf5382 /dovetail/utils | |
| parent | c308b9a718b8b4fc5e781f8d2a6dbe714e381834 (diff) | |
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 <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'dovetail/utils')
| -rw-r--r-- | dovetail/utils/dovetail_config.py | 10 |
1 files changed, 4 insertions, 6 deletions
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]] |