Refactor capture_time_log

Make the logic simpler and generalize timing capabilities with a
decorator.

Also fetch functionality from this functest commit.
https://gerrit.opnfv.org/gerrit/#/c/24559/

Change-Id: I0c6392f384021b8f8a3ce3f740c2e5f980e0078c
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>

1 files changed, 17 insertions, 6 deletions

diff --git a/tests/functest/odl-sfc/sfc.py b/tests/functest/odl-sfc/sfc.py
index edc1aaaa..3cc3189b 100755
--- a/tests/functest/odl-sfc/sfc.py
+++ b/tests/functest/odl-sfc/sfc.py
@@ -7,8 +7,10 @@ import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as os_utils
 import functest.utils.openstack_tacker as os_tacker
 import threading
+import ovs_utils
 import utils as test_utils
 
+
 parser = argparse.ArgumentParser()
 
 parser.add_argument("-r", "--report",
@@ -92,6 +94,10 @@ def main():
     controller_clients = test_utils.get_ssh_clients("controller", PROXY)
     compute_clients = test_utils.get_ssh_clients("compute", PROXY)
 
+    ovs_logger = ovs_utils.OVSLogger(
+        os.path.join(SFC_TEST_DIR, 'ovs-logs'),
+        FUNCTEST_RESULTS_DIR)
+
     image_id = os_utils.create_glance_image(glance_client,
                                             IMAGE_NAME,
                                             IMAGE_PATH,
@@ -160,7 +166,7 @@ def main():
 
     # Start measuring the time it takes to implement the classification rules
     t1 = threading.Thread(target=test_utils.capture_time_log,
-                          args=(compute_clients,))
+                          args=(ovs_logger, compute_clients,))
     try:
         t1.start()
     except Exception, e:
@@ -194,7 +200,8 @@ def main():
     else:
         error = ('\033[91mTEST 1 [FAILED] ==> SSH NOT BLOCKED\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(controller_clients, compute_clients, error)
+        test_utils.capture_err_logs(
+            ovs_logger, controller_clients, compute_clients, error)
         update_json_results("Test 1: SSH Blocked", "Failed")
 
     logger.info("Test HTTP")
@@ -204,7 +211,8 @@ def main():
     else:
         error = ('\033[91mTEST 2 [FAILED] ==> HTTP BLOCKED\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(controller_clients, compute_clients, error)
+        test_utils.capture_err_logs(
+            ovs_logger, controller_clients, compute_clients, error)
         update_json_results("Test 2: HTTP works", "Failed")
 
     logger.info("Changing the classification")
@@ -231,7 +239,7 @@ def main():
 
     # Start measuring the time it takes to implement the classification rules
     t2 = threading.Thread(target=test_utils.capture_time_log,
-                          args=(compute_clients,))
+                          args=(ovs_logger, compute_clients,))
     try:
         t2.start()
     except Exception, e:
@@ -247,7 +255,8 @@ def main():
     else:
         error = ('\033[91mTEST 3 [FAILED] ==> HTTP WORKS\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(controller_clients, compute_clients, error)
+        test_utils.capture_err_logs(
+            ovs_logger, controller_clients, compute_clients, error)
         update_json_results("Test 3: HTTP Blocked", "Failed")
 
     logger.info("Test SSH")
@@ -257,7 +266,8 @@ def main():
     else:
         error = ('\033[91mTEST 4 [FAILED] ==> SSH BLOCKED\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(controller_clients, compute_clients, error)
+        test_utils.capture_err_logs(
+            ovs_logger, controller_clients, compute_clients, error)
         update_json_results("Test 4: SSH Works", "Failed")
 
     if json_results["failures"]:
@@ -274,6 +284,7 @@ def main():
                                     stop_time,
                                     status,
                                     json_results)
+        ovs_logger.create_artifact_archive()
 
     if status == "PASS":
         logger.info('\033[92mSFC ALL TESTS: %s :)\033[0m' % status)