From c6276aad7b90561fa97d45ea1020b061b7c9ccd1 Mon Sep 17 00:00:00 2001
From: SerenaFeng <feng.xiaowei@zte.com.cn>
Date: Fri, 29 Jul 2016 15:16:14 +0800
Subject: [PATCH] unify test results logger and apply to parser

refine a unified method to log the test results
and use it to parser.

JIRA: FUNCTEST-397

Change-Id: I5ed6b04107be5590b1d9d5683c8f1846fef5a4d4
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
---
 testcases/vnf/RNC/parser.py | 27 ++++++++++-----------------
 utils/functest_utils.py     | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/testcases/vnf/RNC/parser.py b/testcases/vnf/RNC/parser.py
index 7def5bf8..485af0e1 100644
--- a/testcases/vnf/RNC/parser.py
+++ b/testcases/vnf/RNC/parser.py
@@ -27,13 +27,14 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
 dirs = functest_yaml.get('general').get('directories')
 FUNCTEST_REPO = dirs.get('dir_repo_functest')
 PARSER_REPO = dirs.get('dir_repo_parser')
-TEST_DB_URL = functest_yaml.get('results').get('test_db_url')
 
 logger = ft_logger.Logger("parser").getLogger()
 
 
 def main():
     EXIT_CODE = -1
+    project = 'parser'
+    case_name = 'parser-basics'
     cmd = 'cd %s/tests && ./functest_run.sh' % PARSER_REPO
     start_time = time.time()
 
@@ -54,27 +55,19 @@ def main():
         'duration': duration,
         'status': test_status,
     }
-    pod_name = functest_utils.get_pod_name(logger)
-    scenario = functest_utils.get_scenario(logger)
-    version = functest_utils.get_version(logger)
-    build_tag = functest_utils.get_build_tag(logger)
 
     status = "FAIL"
     if details['status'] == "OK":
         status = "PASS"
 
-    logger.info("Pushing Parser results: TEST_DB_URL=%(db)s pod_name=%(pod)s "
-                "version=%(v)s scenario=%(s)s criteria=%(c)s details=%(d)s" % {
-                    'db': TEST_DB_URL,
-                    'pod': pod_name,
-                    'v': version,
-                    's': scenario,
-                    'c': status,
-                    'b': build_tag,
-                    'd': details,
-                })
-    functest_utils.push_results_to_db("parser",
-                                      "parser-basics",
+    functest_utils.logger_test_results(logger,
+                                       project,
+                                       case_name,
+                                       status,
+                                       details)
+
+    functest_utils.push_results_to_db(project,
+                                      case_name,
                                       logger,
                                       start_time,
                                       stop_time,
diff --git a/utils/functest_utils.py b/utils/functest_utils.py
index b46dc7dd..a21ac446 100644
--- a/utils/functest_utils.py
+++ b/utils/functest_utils.py
@@ -163,6 +163,27 @@ def get_db_url(logger=None):
     return db_url
 
 
+def logger_test_results(logger, project, case_name, status, details):
+    pod_name = get_pod_name(logger)
+    scenario = get_scenario(logger)
+    version = get_version(logger)
+    build_tag = get_build_tag(logger)
+
+    logger.info("Pushing %(p)s/%(n)s results: TEST_DB_URL=%(db)s "
+                "pod_name=%(pod)s version=%(v)s scenario=%(s)s "
+                "criteria=%(c)s details=%(d)s" % {
+                    'p': project,
+                    'n': case_name,
+                    'db': get_db_url(),
+                    'pod': pod_name,
+                    'v': version,
+                    's': scenario,
+                    'c': status,
+                    'b': build_tag,
+                    'd': details,
+                })
+
+
 def push_results_to_db(project, case_name, logger,
                        start_date, stop_date, criteria, details):
     """
-- 
2.16.6