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

1 files changed, 7 insertions, 8 deletions

diff --git a/dovetail/testcase.py b/dovetail/testcase.py
index b1c3b621..6f0552b6 100644
--- a/dovetail/testcase.py
+++ b/dovetail/testcase.py
@@ -13,9 +13,7 @@ import yaml
 import utils.dovetail_logger as dt_logger
 
 from parser import Parser
-from conf.dovetail_config import CERT_PATH
-from conf.dovetail_config import TESTCASE_PATH
-from conf.dovetail_config import dovetail_config
+from conf.dovetail_config import DovetailConfig as dt_config
 
 logger = dt_logger.Logger('testcase.py').getLogger()
 
@@ -31,7 +29,8 @@ class Testcase:
                                     self.script_testcase())
 
     def prepare_cmd(self):
-        for cmd in dovetail_config[self.script_type()]['testcase']['cmds']:
+        script_type = self.script_type()
+        for cmd in dt_config.dovetail_config[script_type]['testcase']['cmds']:
             cmd_lines = Parser.parse_cmd(cmd, self)
             if not cmd_lines:
                 return False
@@ -108,11 +107,11 @@ class Testcase:
 
     @staticmethod
     def pre_condition_cls(script_type):
-        return dovetail_config[script_type]['pre_condition']
+        return dt_config.dovetail_config[script_type]['pre_condition']
 
     @staticmethod
     def post_condition_cls(script_type):
-        return dovetail_config[script_type]['post_condition']
+        return dt_config.dovetail_config[script_type]['post_condition']
 
     @classmethod
     def update_script_testcase(cls, script_type, script_testcase):
@@ -141,7 +140,7 @@ class Testcase:
 
     @classmethod
     def load(cls):
-        for root, dirs, files in os.walk(TESTCASE_PATH):
+        for root, dirs, files in os.walk(dt_config.TESTCASE_PATH):
             for testcase_file in files:
                 with open(os.path.join(root, testcase_file)) as f:
                     testcase_yaml = yaml.safe_load(f)
@@ -171,7 +170,7 @@ class Scenario:
 
     @classmethod
     def load(cls):
-        for root, dirs, files in os.walk(CERT_PATH):
+        for root, dirs, files in os.walk(dt_config.CERT_PATH):
             for scenario_yaml in files:
                 with open(os.path.join(root, scenario_yaml)) as f:
                     scenario_yaml = yaml.safe_load(f)