Remove SFF_filter

After further investigation we found out that the classifier is deployed in all
computes. When deploying several tests, ODL starts to function very slowly and
sometimes the classifier takes a long time to be deployed in one compute. That
tricked us and made us think that it was not deployed everywhere

Change-Id: I474a05f77a6342be741d14ffbdb674ef7f970908
Signed-off-by: “Manuel Buil” <mbuil@suse.com>

3 files changed, 3 insertions, 23 deletions

diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py
index d054a0e2..c3a587e0 100644
--- a/sfc/lib/utils.py
+++ b/sfc/lib/utils.py
@@ -472,18 +472,3 @@ def get_nova_id(tacker_client, resource, vnf_id=None, vnf_name=None):
         logger.error("Cannot get nova ID for VNF (id='%s', name='%s')"
                      % (vnf_id, vnf_name))
         return None
-
-
-def filter_sffs(compute_nodes, testTopology, vnfs):
-    if 'nova' in testTopology.values():
-        computes_to_check = [node.id for node in compute_nodes]
-    else:
-        # Get the number of the compute (e.g.node-7.domain.tld ==> 7)
-        computes_to_check = [
-            testTopology[vnf].split('.')[0].split('-')[1] for vnf in vnfs]
-
-    computes_sff = [
-        node.ssh_client for node in compute_nodes
-        if node.id in computes_to_check]
-
-    return computes_sff
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 69d86f3f..77c3a4e5 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
@@ -167,12 +167,9 @@ def main():
 
     num_chains = 1
 
-    # We want to check the classif. only in the SFFs (computes with a SF)
-    compute_sffs = test_utils.filter_sffs(compute_nodes, testTopology, vnfs)
-
     # Start measuring the time it takes to implement the classification rules
     t1 = threading.Thread(target=test_utils.wait_for_classification_rules,
-                          args=(ovs_logger, compute_sffs, num_chains,))
+                          args=(ovs_logger, compute_clients, num_chains,))
     try:
         t1.start()
     except Exception, e:
diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
index f7527d48..9f301281 100644
--- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
+++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
@@ -181,12 +181,10 @@ def main():
     logger.info(test_utils.run_cmd('tacker sfc-classifier-list')[1])
 
     num_chains = 2
-    # We want to check the classif. only in the SFFs (computes with a SF)
-    compute_sffs = test_utils.filter_sffs(compute_nodes, testTopology, vnfs)
 
     # Start measuring the time it takes to implement the classification rules
     t1 = threading.Thread(target=test_utils.wait_for_classification_rules,
-                          args=(ovs_logger, compute_sffs, num_chains,))
+                          args=(ovs_logger, compute_clients, num_chains,))
 
     try:
         t1.start()
@@ -258,7 +256,7 @@ def main():
 
     # Start measuring the time it takes to implement the classification rules
     t2 = threading.Thread(target=test_utils.wait_for_classification_rules,
-                          args=(ovs_logger, compute_sffs, num_chains,))
+                          args=(ovs_logger, compute_clients, num_chains,))
     try:
         t2.start()
     except Exception, e: