diff options
author | “Manuel Buil” <mbuil@suse.com> | 2017-03-14 14:14:38 +0100 |
---|---|---|
committer | Manuel Buil <mbuil@suse.com> | 2017-03-15 13:13:23 +0000 |
commit | 3e16bae24230611c29b503de0c5df5c45cd2527d (patch) | |
tree | daeb24a0816671a49987f9ffb6c3e4d692f8c865 /sfc/tests | |
parent | 2ebb76e757caf2a450758a14223f9a16d8d154ea (diff) |
Bug fix: Classification check failing
If both SFs are in one host, the classification rules are not implemented
in all the hosts
Change-Id: Ifea131a86f49d33fdc6110a13d5fdc6c2796f7fa
Signed-off-by: Manuel Buil <mbuil@suse.com>
(cherry picked from commit da6d1d2e018e358f71ad734766580a7343829c29)
Diffstat (limited to 'sfc/tests')
-rw-r--r-- | sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py | 5 | ||||
-rw-r--r-- | sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 8 |
2 files changed, 10 insertions, 3 deletions
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 77c3a4e5..69d86f3f 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,9 +167,12 @@ 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_clients, num_chains,)) + args=(ovs_logger, compute_sffs, 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 d96b9d83..f7527d48 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -181,9 +181,13 @@ 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_clients, num_chains,)) + args=(ovs_logger, compute_sffs, num_chains,)) + try: t1.start() except Exception, e: @@ -254,7 +258,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_clients,)) + args=(ovs_logger, compute_sffs, num_chains,)) try: t2.start() except Exception, e: |