Merge "Add reporting flag to push reuslts only from CI"

4 files changed, 75 insertions, 75 deletions

diff --git a/testcases/features/copper.py b/testcases/features/copper.py
index 78c0fb4d..74ef4390 100755
--- a/testcases/features/copper.py
+++ b/testcases/features/copper.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and

 # limitations under the License.

 #

-

+import argparse

 import os

 import sys

 import time

@@ -22,6 +22,11 @@ import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as functest_utils

 import yaml

 

+parser = argparse.ArgumentParser()

+parser.add_argument("-r", "--report",

+                    help="Create json result file",

+                    action="store_true")

+args = parser.parse_args()

 

 with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:

     functest_yaml = yaml.safe_load(f)

@@ -29,7 +34,6 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
 dirs = functest_yaml.get('general').get('directories')

 FUNCTEST_REPO = dirs.get('dir_repo_functest')

 COPPER_REPO = dirs.get('dir_repo_copper')

-TEST_DB_URL = functest_yaml.get('results').get('test_db_url')

 

 logger = ft_logger.Logger("copper").getLogger()

 

@@ -55,30 +59,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)

-

+    functest_utils.logger_test_results(logger, "Copper",

+                                       "copper-notification",

+                                       details['status'], details)

     try:

-        logger.info("Pushing COPPER 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': details['status'],

-                        'b': build_tag,

-                        'd': details,

-                    })

-        functest_utils.push_results_to_db("copper",

-                                          "copper-notification",

-                                          logger,

-                                          start_time,

-                                          stop_time,

-                                          details['status'],

-                                          details)

+        if args.report:

+            functest_utils.push_results_to_db("copper",

+                                              "copper-notification",

+                                              logger,

+                                              start_time,

+                                              stop_time,

+                                              details['status'],

+                                              details)

+            logger.info("COPPER results pushed to DB")

     except:

         logger.error("Error pushing results into Database '%s'"

                      % sys.exc_info()[0])

diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py
index 184ab032..154cfc69 100755
--- a/testcases/features/doctor.py
+++ b/testcases/features/doctor.py
@@ -13,7 +13,7 @@
 # 0.2: measure test duration and publish results under json format
 #
 #
-
+import argparse
 import os
 import time
 import yaml
@@ -21,13 +21,18 @@ import yaml
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as functest_utils
 
+parser = argparse.ArgumentParser()
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+args = parser.parse_args()
+
 with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
     functest_yaml = yaml.safe_load(f)
 
 dirs = functest_yaml.get('general').get('directories')
 FUNCTEST_REPO = dirs.get('dir_repo_functest')
 DOCTOR_REPO = dirs.get('dir_repo_doctor')
-TEST_DB_URL = functest_yaml.get('results').get('test_db_url')
 
 logger = ft_logger.Logger("doctor").getLogger()
 
@@ -55,32 +60,21 @@ 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 Doctor 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("doctor",
-                                      "doctor-notification",
-                                      logger,
-                                      start_time,
-                                      stop_time,
-                                      status,
-                                      details)
+    functest_utils.logger_test_results(logger, "Doctor",
+                                       "doctor-notification",
+                                       status, details)
+    if args.report:
+        functest_utils.push_results_to_db("doctor",
+                                          "doctor-notification",
+                                          logger,
+                                          start_time,
+                                          stop_time,
+                                          status,
+                                          details)
+        logger.info("Doctor results pushed to DB")
 
     exit(exit_code)
 
diff --git a/testcases/features/domino.py b/testcases/features/domino.py
index e4229b4c..03ad4a2a 100755
--- a/testcases/features/domino.py
+++ b/testcases/features/domino.py
@@ -11,9 +11,10 @@
 # Later, the VM2 boots then execute cloud-init to ping VM1.
 # After successful ping, both the VMs are deleted.
 # 0.2: measure test duration and publish results under json format
-#
+# 0.3: add report flag to push results when needed
 #
 
+import argparse
 import os
 import time
 import yaml
@@ -21,13 +22,19 @@ import yaml
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as functest_utils
 
+parser = argparse.ArgumentParser()
+
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+args = parser.parse_args()
+
 with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
     functest_yaml = yaml.safe_load(f)
 
 dirs = functest_yaml.get('general').get('directories')
 FUNCTEST_REPO = dirs.get('dir_repo_functest')
 DOMINO_REPO = dirs.get('dir_repo_domino')
-TEST_DB_URL = functest_yaml.get('results').get('test_db_url')
 
 logger = ft_logger.Logger("domino").getLogger()
 
@@ -55,10 +62,6 @@ 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":
@@ -66,25 +69,20 @@ def main():
     elif details['status'] == "SKIPPED":
         status = "SKIP"
 
-    logger.info("Pushing Domino 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,
-                })
-
-    if status is not "SKIP":
-        functest_utils.push_results_to_db("domino",
-                                          "domino-multinode",
-                                          logger,
-                                          start_time,
-                                          stop_time,
-                                          status,
-                                          details)
+    functest_utils.logger_test_results(logger, "Domino",
+                                       "domino-multinode",
+                                       status, details)
+    if args.report:
+        if status is not "SKIP":
+            functest_utils.push_results_to_db("domino",
+                                              "domino-multinode",
+                                              logger,
+                                              start_time,
+                                              stop_time,
+                                              status,
+                                              details)
+            logger.info("Domino results pushed to DB")
+
 
 if __name__ == '__main__':
     main()
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index bdd27905..f8af5106 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -408,6 +408,21 @@ def main():
             logger.info('\033[92m' + "SFC TEST WORKED"
                         " :) \n" + '\033[0m')
 
+    # TODO report results to DB
+    # functest_utils.logger_test_results(logger, "SFC",
+    # "odl-sfc",
+    # status, details)
+    # see doctor, promise, domino, ...
+    # if args.report:
+        # logger.info("Pushing odl-SFC results")
+        # functest_utils.push_results_to_db("functest",
+        #                                  "odl-sfc",
+        #                                  logger,
+        #                                  start_time,
+        #                                  stop_time,
+        #                                  status,
+        #                                  details)
+
     sys.exit(0)
 
 if __name__ == '__main__':