From 5a79accd07217ea901f77eaca77fb8d078b75b37 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 12 Nov 2018 11:01:11 +0100 Subject: Fix bug in the symmetric test case The symmetric testcase requires the neutron port of the server to check that the classification rules were written in the flow tables. This patch adds that. Change-Id: I7ce930b102409f2772771a9c5b0e6de99bb293a0 Signed-off-by: Manuel Buil (cherry picked from commit 61599026dc4f0a940d0e3aa7d724494222ee1415) --- sfc/tests/functest/sfc_symmetric_chain.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'sfc/tests/functest/sfc_symmetric_chain.py') diff --git a/sfc/tests/functest/sfc_symmetric_chain.py b/sfc/tests/functest/sfc_symmetric_chain.py index 4593d8c6..7df938e3 100644 --- a/sfc/tests/functest/sfc_symmetric_chain.py +++ b/sfc/tests/functest/sfc_symmetric_chain.py @@ -48,11 +48,13 @@ class SfcSymmetricChain(sfc_parent_function.SfcCommonTestCase): # Start measuring the time it takes to implement the classification # rules - t1 = threading.Thread(target=wait_for_classification_rules, + t1 = threading.Thread(target=symmetric_wait_for_classification_rules, args=(self.ovs_logger, self.compute_nodes, - self.odl_ip, self.odl_port, + self.server_instance.compute_host, + self.neutron_server_port, self.client_instance.compute_host, - [self.neutron_port],)) + self.neutron_client_port, + self.odl_ip, self.odl_port,)) try: t1.start() except Exception as e: @@ -110,10 +112,10 @@ class SfcSymmetricChain(sfc_parent_function.SfcCommonTestCase): return self.creators -def wait_for_classification_rules(ovs_logger, compute_nodes, - server_compute, server_port, - client_compute, client_port, - odl_ip, odl_port): +def symmetric_wait_for_classification_rules(ovs_logger, compute_nodes, + server_compute, server_port, + client_compute, client_port, + odl_ip, odl_port): if client_compute == server_compute: odl_utils.wait_for_classification_rules( ovs_logger, -- cgit 1.2.3-korg