From 2ae61333cb9dae3bc8d5da567323b05ebe2f1108 Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 14 Dec 2016 09:18:10 +0000 Subject: dovetail tool: move conf/dovetail_config.py into utils/ 1. move conf/dovetail_config.py into utils/ 2. change the open file path in dovetail_config.py 3. do some modification about all 'from conf.dovetail_config import ***' JIRA: DOVETAIL-158 Change-Id: I7670e6de993899e4e2a604cbc501dc3339896ef1 Signed-off-by: xudan --- dovetail/conf/dovetail_config.py | 101 ------------------------------------ dovetail/container.py | 2 +- dovetail/parser.py | 2 +- dovetail/report.py | 2 +- dovetail/run.py | 2 +- dovetail/testcase.py | 2 +- dovetail/tests/unit/test_parser.py | 2 +- dovetail/utils/dovetail_config.py | 102 +++++++++++++++++++++++++++++++++++++ dovetail/utils/dovetail_logger.py | 2 +- 9 files changed, 109 insertions(+), 108 deletions(-) delete mode 100644 dovetail/conf/dovetail_config.py create mode 100644 dovetail/utils/dovetail_config.py diff --git a/dovetail/conf/dovetail_config.py b/dovetail/conf/dovetail_config.py deleted file mode 100644 index 1087bdc5..00000000 --- a/dovetail/conf/dovetail_config.py +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env python -# -# grakiss.wanglei@huawei.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -# - -import yaml -import os -import re - - -class DovetailConfig: - - dovetail_config = {} - - CMD_NAME_TRANS = { - 'SUT_TYPE': 'INSTALLER_TYPE', - 'SUT_IP': 'INSTALLER_IP', - 'CON_DEBUG': 'CI_DEBUG', - } - - @classmethod - def load_config_files(cls): - curr_path = os.path.dirname(os.path.abspath(__file__)) - with open(os.path.join(curr_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(curr_path, extra_config_file)) as f: - extra_config = yaml.safe_load(f) - cls.dovetail_config.update(extra_config) - - path = os.path.join(curr_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]] - - @classmethod - def cmd_name_trans(cls, cmd_name): - key = cmd_name.upper() - return cls.CMD_NAME_TRANS.get(key, key) - - # Analyze the kind of the giving path, - # return true for env path, - # return false for non_env path. - @classmethod - def is_env_path(cls, path): - if len(path) == 2: - test_project = cls.dovetail_config['test_project'] - if path[0] in test_project and path[1] == 'envs': - return True - else: - return False - - # update dovetail_config dict with the giving path. - # if path is in the dovetail_config dict, its value will be replaced. - # if path is not in the dict, it will be added as a new item of the dict. - @classmethod - def update_config(cls, config_dict): - for key, value in config_dict.items(): - path_list = [] - for item in value['path']: - path_list.append([(k.strip()) for k in item.split('/')]) - for path in path_list: - if cls.is_env_path(path): - cls.update_envs(key, path, value['value']) - else: - cls.update_non_envs(path, value['value']) - - @classmethod - def update_envs(cls, key, path, value): - key = cls.cmd_name_trans(key) - if not value and key in os.environ: - value = os.environ[key] - if value: - cls.update_config_envs(path[0], key, value) - - @classmethod - def update_config_envs(cls, validate_type, key, value): - envs = cls.dovetail_config[validate_type]['envs'] - old_value = re.findall(r'\s+%s=(.*?)(\s+|$)' % key, envs) - if old_value == []: - envs += ' -e ' + key + '=' + value - else: - envs = envs.replace(old_value[0][0], value) - cls.dovetail_config[validate_type]['envs'] = envs - return envs - - @staticmethod - def set_leaf_dict(dic, path, value): - for key in path[:-1]: - dic = dic.setdefault(key, {}) - dic[path[-1]] = value - - @classmethod - def update_non_envs(cls, path, value): - if value: - cls.set_leaf_dict(cls.dovetail_config, path, value) diff --git a/dovetail/container.py b/dovetail/container.py index 87174727..948dce93 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -10,7 +10,7 @@ import utils.dovetail_logger as dt_logger import utils.dovetail_utils as dt_utils -from conf.dovetail_config import DovetailConfig as dt_cfg +from utils.dovetail_config import DovetailConfig as dt_cfg class Container: diff --git a/dovetail/parser.py b/dovetail/parser.py index ad969bc2..b00b0f89 100644 --- a/dovetail/parser.py +++ b/dovetail/parser.py @@ -12,7 +12,7 @@ import jinja2 import utils.dovetail_logger as dt_logger import utils.dovetail_utils as dt_utils -from conf.dovetail_config import DovetailConfig as dt_cfg +from utils.dovetail_config import DovetailConfig as dt_cfg class Parser: diff --git a/dovetail/report.py b/dovetail/report.py index 1f970b29..bee84041 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -17,7 +17,7 @@ import uuid import utils.dovetail_logger as dt_logger -from conf.dovetail_config import DovetailConfig as dt_cfg +from utils.dovetail_config import DovetailConfig as dt_cfg from testcase import Testcase diff --git a/dovetail/run.py b/dovetail/run.py index c0cc872c..368ea675 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -22,7 +22,7 @@ from testcase import Testsuite from report import Report from report import FunctestCrawler, YardstickCrawler from report import FunctestChecker, YardstickChecker -from conf.dovetail_config import DovetailConfig as dt_cfg +from utils.dovetail_config import DovetailConfig as dt_cfg from test_runner import DockerRunner, ShellRunner diff --git a/dovetail/testcase.py b/dovetail/testcase.py index 6f2d76de..4310f9b4 100644 --- a/dovetail/testcase.py +++ b/dovetail/testcase.py @@ -13,7 +13,7 @@ import yaml import utils.dovetail_logger as dt_logger from parser import Parser -from conf.dovetail_config import DovetailConfig as dt_cfg +from utils.dovetail_config import DovetailConfig as dt_cfg from test_runner import TestRunnerFactory diff --git a/dovetail/tests/unit/test_parser.py b/dovetail/tests/unit/test_parser.py index 410a6629..73ed2b72 100644 --- a/dovetail/tests/unit/test_parser.py +++ b/dovetail/tests/unit/test_parser.py @@ -25,7 +25,7 @@ class TestParser(unittest.TestCase): def setUp(self): """Test case setup""" - from conf.dovetail_config import DovetailConfig as dt_cfg + from utils.dovetail_config import DovetailConfig as dt_cfg dt_cfg.load_config_files() dovetail_parser.Parser.create_log() logging.disable(logging.CRITICAL) diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py new file mode 100644 index 00000000..33cf57be --- /dev/null +++ b/dovetail/utils/dovetail_config.py @@ -0,0 +1,102 @@ +#!/usr/bin/env python +# +# grakiss.wanglei@huawei.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# + +import yaml +import os +import re + + +class DovetailConfig: + + dovetail_config = {} + + CMD_NAME_TRANS = { + 'SUT_TYPE': 'INSTALLER_TYPE', + 'SUT_IP': 'INSTALLER_IP', + 'CON_DEBUG': 'CI_DEBUG', + } + + @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: + 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: + extra_config = yaml.safe_load(f) + cls.dovetail_config.update(extra_config) + + path = os.path.join(config_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]] + + @classmethod + def cmd_name_trans(cls, cmd_name): + key = cmd_name.upper() + return cls.CMD_NAME_TRANS.get(key, key) + + # Analyze the kind of the giving path, + # return true for env path, + # return false for non_env path. + @classmethod + def is_env_path(cls, path): + if len(path) == 2: + test_project = cls.dovetail_config['test_project'] + if path[0] in test_project and path[1] == 'envs': + return True + else: + return False + + # update dovetail_config dict with the giving path. + # if path is in the dovetail_config dict, its value will be replaced. + # if path is not in the dict, it will be added as a new item of the dict. + @classmethod + def update_config(cls, config_dict): + for key, value in config_dict.items(): + path_list = [] + for item in value['path']: + path_list.append([(k.strip()) for k in item.split('/')]) + for path in path_list: + if cls.is_env_path(path): + cls.update_envs(key, path, value['value']) + else: + cls.update_non_envs(path, value['value']) + + @classmethod + def update_envs(cls, key, path, value): + key = cls.cmd_name_trans(key) + if not value and key in os.environ: + value = os.environ[key] + if value: + cls.update_config_envs(path[0], key, value) + + @classmethod + def update_config_envs(cls, validate_type, key, value): + envs = cls.dovetail_config[validate_type]['envs'] + old_value = re.findall(r'\s+%s=(.*?)(\s+|$)' % key, envs) + if old_value == []: + envs += ' -e ' + key + '=' + value + else: + envs = envs.replace(old_value[0][0], value) + cls.dovetail_config[validate_type]['envs'] = envs + return envs + + @staticmethod + def set_leaf_dict(dic, path, value): + for key in path[:-1]: + dic = dic.setdefault(key, {}) + dic[path[-1]] = value + + @classmethod + def update_non_envs(cls, path, value): + if value: + cls.set_leaf_dict(cls.dovetail_config, path, value) diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py index bb09a7b1..685db8f7 100644 --- a/dovetail/utils/dovetail_logger.py +++ b/dovetail/utils/dovetail_logger.py @@ -24,7 +24,7 @@ import logging import os -from conf.dovetail_config import DovetailConfig as dt_cfg +from dovetail_config import DovetailConfig as dt_cfg class Logger: -- cgit 1.2.3-korg