Sanitize sfc.lib.utils

- Remove unused (and unnecessary) wrapper function get_compute_nodes
- Rename capture_err_logs to descriptive capture_ovs_logs
- Rename compute_node argument in create_instance to av_zone
- Rename capture_time_logs to more accurate
  wait_for_classification_rules

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

2 files changed, 8 insertions, 8 deletions

diff --git a/sfc/tests/functest/sfc.py b/sfc/tests/functest/sfc.py
index a4f5b37f..7bb5a5ac 100644
--- a/sfc/tests/functest/sfc.py
+++ b/sfc/tests/functest/sfc.py
@@ -162,7 +162,7 @@ def main():
     logger.info(test_utils.run_cmd('tacker sfc-classifier-list'))
 
     # Start measuring the time it takes to implement the classification rules
-    t1 = threading.Thread(target=test_utils.capture_time_log,
+    t1 = threading.Thread(target=test_utils.wait_for_classification_rules,
                           args=(ovs_logger, compute_clients,))
     try:
         t1.start()
@@ -196,7 +196,7 @@ def main():
     else:
         error = ('\033[91mTEST 1 [FAILED] ==> SSH NOT BLOCKED\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(
+        test_utils.capture_ovs_logs(
             ovs_logger, controller_clients, compute_clients, error)
         results.add_to_summary(2, "FAIL", "SSH Blocked")
 
@@ -206,7 +206,7 @@ def main():
     else:
         error = ('\033[91mTEST 2 [FAILED] ==> HTTP BLOCKED\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(
+        test_utils.capture_ovs_logs(
             ovs_logger, controller_clients, compute_clients, error)
         results.add_to_summary(2, "FAIL", "HTTP works")
 
@@ -233,7 +233,7 @@ def main():
     logger.info(test_utils.run_cmd('tacker sfc-classifier-list'))
 
     # Start measuring the time it takes to implement the classification rules
-    t2 = threading.Thread(target=test_utils.capture_time_log,
+    t2 = threading.Thread(target=test_utils.wait_for_classification_rules,
                           args=(ovs_logger, compute_clients,))
     try:
         t2.start()
@@ -249,7 +249,7 @@ def main():
     else:
         error = ('\033[91mTEST 3 [FAILED] ==> HTTP WORKS\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(
+        test_utils.capture_ovs_logs(
             ovs_logger, controller_clients, compute_clients, error)
         results.add_to_summary(2, "FAIL", "HTTP Blocked")
 
@@ -259,7 +259,7 @@ def main():
     else:
         error = ('\033[91mTEST 4 [FAILED] ==> SSH BLOCKED\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(
+        test_utils.capture_ovs_logs(
             ovs_logger, controller_clients, compute_clients, error)
         results.add_to_summary(2, "FAIL", "SSH works")
 
diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
index 63edd7e6..9661ee09 100644
--- a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
+++ b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
@@ -224,7 +224,7 @@ def main():
     else:
         error = ('\033[91mTEST 1 [FAILED] ==> HTTP BLOCKED\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(
+        test_utils.capture_ovs_logs(
             ovs_logger, controller_clients, compute_clients, error)
         update_json_results("Test 1: HTTP works", "Failed")
 
@@ -241,7 +241,7 @@ def main():
     else:
         error = ('\033[91mTEST 2 [FAILED] ==> HTTP WORKS\033[0m')
         logger.error(error)
-        test_utils.capture_err_logs(
+        test_utils.capture_ovs_logs(
             ovs_logger, controller_clients, compute_clients, error)
         update_json_results("Test 2: HTTP Blocked", "Failed")