Merge "dovetail tool: reorganize dovetail_config.py and modify related files"

1 files changed, 11 insertions, 13 deletions

diff --git a/dovetail/run.py b/dovetail/run.py
index 0ebae734..86194389 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -18,16 +18,14 @@ from container import Container
 from testcase import Testcase
 from testcase import Scenario
 from report import Report
-from conf.dovetail_config import SCENARIO_NAMING_FMT
-from conf.dovetail_config import dovetail_config
-from conf.dovetail_config import update_envs
+from conf.dovetail_config import DovetailConfig as dt_config
 
 logger = dt_logger.Logger('run.py').getLogger()
 
 
 def load_scenario(scenario):
     Scenario.load()
-    return Scenario.get(SCENARIO_NAMING_FMT % scenario)
+    return Scenario.get(dt_config.SCENARIO_NAMING_FMT % scenario)
 
 
 def set_container_tags(option_str):
@@ -35,7 +33,7 @@ def set_container_tags(option_str):
         option_str = script_tag_opt.split(':')
         script_type = option_str[0].strip()
         script_tag = option_str[1].strip()
-        dovetail_config[script_type]['docker_tag'] = script_tag
+        dt_config.dovetail_config[script_type]['docker_tag'] = script_tag
 
 
 def load_testcase():
@@ -98,7 +96,7 @@ def filter_env_options(input_dict):
     envs_options = {}
     for key, value in input_dict.items():
         key = key.upper()
-        if key in dovetail_config['cli']['options']['envs']:
+        if key in dt_config.dovetail_config['cli']['options']['envs']:
             envs_options[key] = value
     return envs_options
 
@@ -110,11 +108,11 @@ def main(*args, **kwargs):
     logger.info('=======================================')
     validate_options(kwargs)
     envs_options = filter_env_options(kwargs)
-    update_envs(envs_options)
+    dt_config.update_envs(envs_options)
     logger.info('Your new envs for functest: %s' %
-                dovetail_config['functest']['envs'])
+                dt_config.dovetail_config['functest']['envs'])
     logger.info('Your new envs for yardstick: %s' %
-                dovetail_config['yardstick']['envs'])
+                dt_config.dovetail_config['yardstick']['envs'])
     load_testcase()
     scenario_yaml = load_scenario(kwargs['scenario'])
     if 'tag' in kwargs and kwargs['tag'] is not None:
@@ -124,15 +122,15 @@ def main(*args, **kwargs):
 
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
-if dovetail_config['cli']['options'] is not None:
-    for key, value in dovetail_config['cli']['options'].items():
+if dt_config.dovetail_config['cli']['options'] is not None:
+    for key, value in dt_config.dovetail_config['cli']['options'].items():
         if value is not None:
             for k, v in value.items():
                 flags = v['flags']
                 del v['flags']
                 main = click.option(*flags, **v)(main)
-if dovetail_config['cli']['arguments'] is not None:
-    for key, value in dovetail_config['cli']['arguments'].items():
+if dt_config.dovetail_config['cli']['arguments'] is not None:
+    for key, value in dt_config.dovetail_config['cli']['arguments'].items():
         if value is not None:
             for k, v in value.items():
                 flags = v['flags']