summaryrefslogtreecommitdiffstats
path: root/dovetail/utils
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2016-12-14 09:18:10 +0000
committerxudan <xudan16@huawei.com>2016-12-15 01:06:56 +0000
commit2ae61333cb9dae3bc8d5da567323b05ebe2f1108 (patch)
tree8a74b2d737cf8e2c58314d70f87c5cf17b98cf71 /dovetail/utils
parent004634d4ce99da007228293877e3dd1e179b02ec (diff)
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 <xudan16@huawei.com>
Diffstat (limited to 'dovetail/utils')
-rw-r--r--dovetail/utils/dovetail_config.py102
-rw-r--r--dovetail/utils/dovetail_logger.py2
2 files changed, 103 insertions, 1 deletions
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: