Revert "write test results to a local file"

This reverts commit ee21af78fbfc93e888acda121f08d2b216dd0159.

Change-Id: If7c8d3b645073574862eb67225b1e11b0dd7a021
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 320102d..49359b5 100755 (executable)
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -155,7 +155,7 @@ def run_test(test, tier_name, testcases=None):
                 result = test_case.run()
             if result == testcase_base.TestcaseBase.EX_OK:
                 if GlobalVariables.REPORT_FLAG:
-                    test_case.publish_report()
+                    test_case.push_to_db()
                 result = test_case.check_criteria()
         except ImportError:
             logger.exception("Cannot import module {}".format(

diff --git a/functest/core/testcase_base.py b/functest/core/testcase_base.py
index ec46bc6..838b639 100644 (file)
--- a/functest/core/testcase_base.py
+++ b/functest/core/testcase_base.py
@@ -9,7 +9,6 @@
 
 import os
 
-from functest.utils.constants import CONST
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 
@@ -18,7 +17,7 @@ class TestcaseBase(object):
 
     EX_OK = os.EX_OK
     EX_RUN_ERROR = os.EX_SOFTWARE
-    EX_PUBLISH_RESULT_FAILED = os.EX_SOFTWARE - 1
+    EX_PUSH_TO_DB_ERROR = os.EX_SOFTWARE - 1
     EX_TESTCASE_FAILED = os.EX_SOFTWARE - 2
 
     logger = ft_logger.Logger(__name__).getLogger()
@@ -44,45 +43,21 @@ class TestcaseBase(object):
         self.logger.error("Run must be implemented")
         return TestcaseBase.EX_RUN_ERROR
 
-    def publish_report(self):
-        if "RESULTS_STORE" in os.environ:
-            CONST.results_test_db_url = os.environ['RESULTS_STORE']
-
+    def push_to_db(self):
         try:
             assert self.project_name
             assert self.case_name
             assert self.criteria
             assert self.start_time
             assert self.stop_time
-            if CONST.results_test_db_url.lower().startswith(
-                    ("http://", "https://")):
-                self.push_to_db()
-            elif CONST.results_test_db_url.lower().startswith("file://"):
-                self.write_to_file()
+            if ft_utils.push_results_to_db(
+                    self.project_name, self.case_name, self.start_time,
+                    self.stop_time, self.criteria, self.details):
+                self.logger.info("The results were successfully pushed to DB")
+                return TestcaseBase.EX_OK
             else:
-                self.logger.error("Please check parameter test_db_url and "
-                                  "OS environ variable RESTULTS_STORE")
-                return TestcaseBase.EX_PUBLISH_RESULT_FAILED
+                self.logger.error("The results cannot be pushed to DB")
+                return TestcaseBase.EX_PUSH_TO_DB_ERROR
         except Exception:
-            self.logger.exception("The results cannot be stored")
-            return TestcaseBase.EX_PUBLISH_RESULT_FAILED
-
-    def write_to_file(self):
-        if ft_utils.write_results_to_file(
-                self.project_name, self.case_name, self.start_time,
-                self.stop_time, self.criteria, self.details):
-            self.logger.info("The results were successfully written to a file")
-            return TestcaseBase.EX_OK
-        else:
-            self.logger.error("write results to a file failed")
-            return TestcaseBase.EX_PUBLISH_RESULT_FAILED
-
-    def push_to_db(self):
-        if ft_utils.push_results_to_db(
-                self.project_name, self.case_name, self.start_time,
-                self.stop_time, self.criteria, self.details):
-            self.logger.info("The results were successfully pushed to DB")
-            return TestcaseBase.EX_OK
-        else:
-            self.logger.error("The results cannot be pushed to DB")
-            return TestcaseBase.EX_PUBLISH_RESULT_FAILED
+            self.logger.exception("The results cannot be pushed to DB")
+            return TestcaseBase.EX_PUSH_TO_DB_ERROR

diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 8285d93..a5309bd 100644 (file)
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -289,6 +289,6 @@ class VPingMain(object):
             if result != VPingBase.EX_OK:
                 return result
             if kwargs['report']:
-                return self.vping.publish_report()
+                return self.vping.push_to_db()
         except Exception:
             return VPingBase.EX_RUN_ERROR

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 2507595..9bff324 100755 (executable)
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -237,6 +237,6 @@ if __name__ == '__main__':
         if result != testcase_base.TestcaseBase.EX_OK:
             sys.exit(result)
         if args['pushtodb']:
-            sys.exit(odl.publish_report())
+            sys.exit(odl.push_to_db())
     except Exception:
         sys.exit(testcase_base.TestcaseBase.EX_RUN_ERROR)

diff --git a/functest/tests/unit/core/test_testcase_base.py b/functest/tests/unit/core/test_testcase_base.py
index 94d2e96..b7c81d8 100755 (executable)
--- a/functest/tests/unit/core/test_testcase_base.py
+++ b/functest/tests/unit/core/test_testcase_base.py
@@ -9,7 +9,6 @@
 
 import logging
 import mock
-import os
 import unittest
 
 from functest.core import testcase_base
@@ -32,12 +31,11 @@ class TestcaseBaseTesting(unittest.TestCase):
         self.assertEqual(self.test.run(),
                          testcase_base.TestcaseBase.EX_RUN_ERROR)
 
-    @mock.patch.dict(os.environ, {})
     @mock.patch('functest.utils.functest_utils.push_results_to_db',
                 return_value=False)
     def _test_missing_attribute(self, mock_function):
-        self.assertEqual(self.test.publish_report(),
-                         testcase_base.TestcaseBase.EX_PUBLISH_RESULT_FAILED)
+        self.assertEqual(self.test.push_to_db(),
+                         testcase_base.TestcaseBase.EX_PUSH_TO_DB_ERROR)
         mock_function.assert_not_called()
 
     def test_missing_case_name(self):
@@ -70,7 +68,7 @@ class TestcaseBaseTesting(unittest.TestCase):
                 return_value=False)
     def test_push_to_db_failed(self, mock_function):
         self.assertEqual(self.test.push_to_db(),
-                         testcase_base.TestcaseBase.EX_PUBLISH_RESULT_FAILED)
+                         testcase_base.TestcaseBase.EX_PUSH_TO_DB_ERROR)
         mock_function.assert_called_once_with(
             self.test.project, self.test.case_name, self.test.start_time,
             self.test.stop_time, self.test.criteria, self.test.details)

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index 0405546..23a51ff 100644 (file)
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -23,10 +23,8 @@ import requests
 import yaml
 from git import Repo
 
-from functest.utils.constants import CONST
 import functest.utils.functest_logger as ft_logger
 
-
 logger = ft_logger.Logger("functest_utils").getLogger()
 
 
@@ -184,43 +182,13 @@ 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
-
-
 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']