1 files changed, 54 insertions, 20 deletions

diff --git a/dovetail/run.py b/dovetail/run.py
index 86194389..e908f3ab 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -13,19 +13,21 @@ import sys
 
 import utils.dovetail_logger as dt_logger
 
-
+from parser import Parser
 from container import Container
 from testcase import Testcase
-from testcase import Scenario
+from testcase import Testsuite
 from report import Report
+from report import FunctestCrawler
+from report import YardstickCrawler
+from report import FunctestChecker
+from report import YardstickChecker
 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(dt_config.SCENARIO_NAMING_FMT % scenario)
+def load_testsuite(testsuite):
+    Testsuite.load()
+    return Testsuite.get(testsuite)
 
 
 def set_container_tags(option_str):
@@ -40,12 +42,17 @@ def load_testcase():
     Testcase.load()
 
 
-def run_test(scenario):
-    for testcase_name in scenario['testcases_list']:
+def run_test(testsuite, testarea, logger):
+    testarea_list = []
+    for value in testsuite['testcases_list']:
+        if value is not None and (testarea == 'full' or testarea in value):
+            testarea_list.append(value)
+
+    for testcase_name in testarea_list:
         logger.info('>>[testcase]: %s' % (testcase_name))
         testcase = Testcase.get(testcase_name)
         if testcase is None:
-            logger.error('testcase %s is not defined in testcase folder, \
+            logger.error('test case %s is not defined in testcase folder, \
                          skipping' % (testcase_name))
             continue
         run_testcase = True
@@ -82,7 +89,7 @@ def run_test(scenario):
         Report.check_result(testcase, db_result)
 
 
-def validate_options(input_dict):
+def validate_options(input_dict, logger):
     # for 'tag' option
     for key, value in input_dict.items():
         if key == 'tag' and value is not None:
@@ -101,24 +108,51 @@ def filter_env_options(input_dict):
     return envs_options
 
 
+def create_logs():
+    Container.create_log()
+    Parser.create_log()
+    Report.create_log()
+    FunctestCrawler.create_log()
+    YardstickCrawler.create_log()
+    FunctestChecker.create_log()
+    YardstickChecker.create_log()
+    Testcase.create_log()
+    Testsuite.create_log()
+
+
 def main(*args, **kwargs):
-    """Dovetail certification test entry!"""
-    logger.info('=======================================')
-    logger.info('Dovetail certification: %s!' % (kwargs['scenario']))
-    logger.info('=======================================')
-    validate_options(kwargs)
+    """Dovetail compliance test entry!"""
+    create_logs()
+    logger = dt_logger.Logger('run').getLogger()
+    logger.info('================================================')
+    logger.info('Dovetail compliance: %s!' % (kwargs['testsuite']))
+    logger.info('================================================')
+    validate_options(kwargs, logger)
     envs_options = filter_env_options(kwargs)
     dt_config.update_envs(envs_options)
     logger.info('Your new envs for functest: %s' %
                 dt_config.dovetail_config['functest']['envs'])
     logger.info('Your new envs for yardstick: %s' %
                 dt_config.dovetail_config['yardstick']['envs'])
-    load_testcase()
-    scenario_yaml = load_scenario(kwargs['scenario'])
+
     if 'tag' in kwargs and kwargs['tag'] is not None:
         set_container_tags(kwargs['tag'])
-    run_test(scenario_yaml)
-    Report.generate(scenario_yaml)
+
+    testarea = kwargs['testarea']
+    testsuite_validation = False
+    testarea_validation = False
+    if (testarea == 'full') or (testarea in dt_config.testarea_supported):
+        testarea_validation = True
+    if kwargs['testsuite'] in dt_config.testsuite_supported:
+        testsuite_validation = True
+    if testsuite_validation and testarea_validation:
+        testsuite_yaml = load_testsuite(kwargs['testsuite'])
+        load_testcase()
+        run_test(testsuite_yaml, testarea, logger)
+        Report.generate(testsuite_yaml, testarea)
+    else:
+        logger.error('invalid input commands, testsuite %s testarea %s' %
+                     (kwargs['testsuite'], testarea))
 
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])