diff options
author | Manuel Buil <mbuil@suse.com> | 2017-09-14 11:58:44 +0200 |
---|---|---|
committer | Manuel Buil <mbuil@suse.com> | 2017-09-15 07:43:30 +0000 |
commit | fd243c2e0f2f4caa405473f95e8de5d44d862e8c (patch) | |
tree | 820f4fc5758e04315645f6a28fbb7ad2a3e26db3 /sfc/tests | |
parent | 9769cfd46f1a4248516d1a87f668e372e45a3086 (diff) |
Update the wait_for_classification_rules function
Two things must be done:
1 - Be compatible with the new way of doing SFC in ODL Nitrogen
2 - Be installer independent
Change-Id: Ibbb3057db30a7c00e92f788bb03e770749e2b255
Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'sfc/tests')
-rw-r--r-- | sfc/tests/functest/sfc_one_chain_two_service_functions.py | 3 | ||||
-rw-r--r-- | sfc/tests/functest/sfc_symmetric_chain.py | 3 | ||||
-rw-r--r-- | sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions.py b/sfc/tests/functest/sfc_one_chain_two_service_functions.py index 8ec0f26c..13ac418d 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py @@ -180,8 +180,7 @@ def main(): # 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_nodes, odl_ip, odl_port, - testTopology,)) + args=(ovs_logger, compute_nodes, odl_ip, odl_port,)) try: t1.start() except Exception as e: diff --git a/sfc/tests/functest/sfc_symmetric_chain.py b/sfc/tests/functest/sfc_symmetric_chain.py index 6fae3e81..1f3065e1 100644 --- a/sfc/tests/functest/sfc_symmetric_chain.py +++ b/sfc/tests/functest/sfc_symmetric_chain.py @@ -182,8 +182,7 @@ def main(): # 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_nodes, odl_ip, odl_port, - testTopology,)) + args=(ovs_logger, compute_nodes, odl_ip, odl_port,)) try: t1.start() 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 49678ead..ff343761 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -188,8 +188,7 @@ def main(): # 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_nodes, odl_ip, odl_port, - testTopology,)) + args=(ovs_logger, compute_nodes, odl_ip, odl_port,)) try: t1.start() @@ -274,8 +273,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_nodes, odl_ip, odl_port, - testTopology,)) + args=(ovs_logger, compute_nodes, odl_ip, odl_port,)) try: t2.start() except Exception as e: |