Merge "Support Yardstick to push results to database"

diff --cc dovetail/container.py
Simple merge

diff --cc dovetail/run.py
index 0037636,a191e39..84bd88f
--- 1/dovetail/run.py
--- 2/dovetail/run.py
+++ b/dovetail/run.py
@@@ -77,33 -77,24 +77,28 @@@ def check_tc_result(testcase, logger)
      dovetail_result = os.path.join(result_dir,
                                     dt_cfg.dovetail_config['result_file'])
      if dt_cfg.dovetail_config['report_dest'].startswith("http"):
-         if validate_type.lower() == 'yardstick':
-             logger.info("Results have been stored with file %s.",
-                         os.path.join(result_dir,
-                                      testcase.validate_testcase() + '.out'))
+         if dt_utils.store_db_results(dt_cfg.dovetail_config['report_dest'],
+                                      dt_cfg.dovetail_config['build_tag'],
+                                      testcase.name(), dovetail_result,
+                                      logger):
+             logger.info("Results have been pushed to database and stored "
+                         "with local file %s.", dovetail_result)
          else:
-             if dt_utils.store_db_results(dt_cfg.dovetail_config['report_dest'],
-                                          dt_cfg.dovetail_config['build_tag'],
-                                          testcase.name(), dovetail_result,
-                                          logger):
-                 logger.info("Results have been pushed to database and stored "
-                             "with local file %s.", dovetail_result)
-             else:
-                 logger.error("Fail to push results to database.")
+             logger.error("Fail to push results to database.")
      if dt_cfg.dovetail_config['report_dest'] == "file":
          if validate_type.lower() == 'yardstick':
 -            logger.info("Results have been stored with file %s.",
 -                        os.path.join(result_dir,
 -                                     testcase.validate_testcase() + '.out'))
 -        if validate_type.lower() == 'functest':
 -            logger.info("Results have been stored with file %s.",
 -                        os.path.join(result_dir, functest_result))
 -        result = Report.get_result(testcase)
 -        Report.check_result(testcase, result)
 +            result_file = os.path.join(result_dir, testcase.name() + '.out')
 +        elif validate_type.lower() == 'functest':
 +            result_file = os.path.join(result_dir, functest_result)
 +        else:
 +            logger.error("Don't support %s now.", validate_type)
 +            return
 +        if os.path.isfile(result_file):
 +            logger.info("Results have been stored with file %s.", result_file)
 +            result = Report.get_result(testcase)
 +            Report.check_result(testcase, result)
 +        else:
 +            logger.error("Fail to store results with file %s.", result_file)
  
  
  def validate_input(input_dict, check_dict, logger):