X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Ffunctest_utils.py;h=b2c36cff984f0cdbe02e1497976de2fb2ec62791;hb=568259b1a056de7e08e568168bf0d881b427a54d;hp=2bf87a05c42b50bafe7cab632084a608b2a9832e;hpb=6503cfae235e53fc994d84411cc8f3d8a59750fd;p=functest.git

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index 2bf87a05c..b2c36cff9 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -23,10 +23,9 @@ import requests
 import yaml
 from git import Repo
 
-from functest.utils.constants import CONST
+from functest.utils import decorators
 import functest.utils.functest_logger as ft_logger
 
-
 logger = ft_logger.Logger("functest_utils").getLogger()
 
 
@@ -96,8 +95,9 @@ def get_scenario():
     try:
         scenario = os.environ['DEPLOY_SCENARIO']
     except KeyError:
-        logger.error("Impossible to retrieve the scenario")
-        scenario = "Unknown_scenario"
+        logger.info("Impossible to retrieve the scenario."
+                    "Use default os-nosdn-nofeature-noha")
+        scenario = "os-nosdn-nofeature-noha"
 
     return scenario
 
@@ -128,7 +128,7 @@ def get_pod_name():
     try:
         return os.environ['NODE_NAME']
     except KeyError:
-        logger.error(
+        logger.info(
             "Unable to retrieve the POD name from environment. " +
             "Using pod name 'unknown-pod'")
         return "unknown-pod"
@@ -141,8 +141,8 @@ def get_build_tag():
     try:
         build_tag = os.environ['BUILD_TAG']
     except KeyError:
-        logger.error("Impossible to retrieve the build tag")
-        build_tag = "unknown_build_tag"
+        logger.info("Impossible to retrieve the build tag")
+        build_tag = "none"
 
     return build_tag
 
@@ -183,43 +183,14 @@ def logger_test_results(project, case_name, status, details):
             'd': details})
 
 
-def write_results_to_file(project, case_name, start_date,
-                          stop_date, criteria, details):
-    file_path = re.split(r'://', CONST.results_test_db_url)[1]
-
-    try:
-        installer = os.environ['INSTALLER_TYPE']
-        scenario = os.environ['DEPLOY_SCENARIO']
-        pod_name = os.environ['NODE_NAME']
-    except KeyError as e:
-        logger.error("Please set env var: " + str(e))
-        return False
-
-    test_start = dt.fromtimestamp(start_date).strftime('%Y-%m-%d %H:%M:%S')
-    test_stop = dt.fromtimestamp(stop_date).strftime('%Y-%m-%d %H:%M:%S')
-
-    params = {"project_name": project, "case_name": case_name,
-              "pod_name": pod_name, "installer": installer,
-              "scenario": scenario, "criteria": criteria,
-              "start_date": test_start, "stop_date": test_stop,
-              "details": details}
-    try:
-        with open(file_path, "a+w") as outfile:
-            json.dump(params, outfile)
-            outfile.write("\n")
-        return True
-    except Exception as e:
-        logger.error("write result data into a file failed: %s" % e)
-        return False
-
-
+@decorators.can_dump_request_to_file
 def push_results_to_db(project, case_name,
                        start_date, stop_date, criteria, details):
     """
     POST results to the Result target DB
     """
     # Retrieve params from CI and conf
-    url = CONST.results_test_db_url + "/results"
+    url = get_db_url() + "/results"
 
     try:
         installer = os.environ['INSTALLER_TYPE']
@@ -299,7 +270,7 @@ def get_resolvconf_ns():
     while line:
         ip = re.search(r"\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b", line)
         if ip:
-            resolver.nameservers = [str(ip)]
+            resolver.nameservers = [ip.group(0)]
             try:
                 result = resolver.query('opnfv.org')[0]
                 if result != "":