Support sfp redirect action on acl flow check

Starting Oxygen, ODL networking-sfc translator supports symmetric
paths and maps flow classifiers to ACLs with SFP redirect action
instead of RSP redirect action. A SFP may have two RSPs associated
if the path is symmetric, one otherwise. One of the two RSPs will
be flagged as the reverse path and the other is the forward path.
Traffic from the logical-source-port will be classified to the forward
path, while traffic from the logical-destination-port will be
classified to the reverse path.

This patch updates the ACL flow check logic to account for the above.

Change-Id: I2d8b9e6c2a1033d469668db29b9c18f525e89370
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com>

3 files changed, 11 insertions, 5 deletions

diff --git a/sfc/tests/functest/sfc_chain_deletion.py b/sfc/tests/functest/sfc_chain_deletion.py
index f96eb120..9fde460f 100644
--- a/sfc/tests/functest/sfc_chain_deletion.py
+++ b/sfc/tests/functest/sfc_chain_deletion.py
@@ -163,7 +163,8 @@ def main():
     # Start measuring the time it takes to implement the classification rules
     t1 = threading.Thread(target=odl_utils.wait_for_classification_rules,
                           args=(ovs_logger, compute_nodes, odl_ip,
-                                odl_port, openstack_sfc.get_compute_client(),))
+                                odl_port, openstack_sfc.get_compute_client(),
+                                [neutron_port],))
 
     try:
         t1.start()
@@ -209,6 +210,7 @@ def main():
     os_sfc_utils.delete_vnffgd(tacker_client, vnffgd_name='red')
 
     if not odl_utils.check_vnffg_deletion(odl_ip, odl_port, ovs_logger,
+                                          [neutron_port],
                                           openstack_sfc.get_compute_client(),
                                           compute_nodes):
         logger.debug("The chains were not correctly removed")
@@ -220,7 +222,8 @@ def main():
     # Start measuring the time it takes to implement the classification rules
     t2 = threading.Thread(target=odl_utils.wait_for_classification_rules,
                           args=(ovs_logger, compute_nodes, odl_ip,
-                                odl_port, openstack_sfc.get_compute_client(),))
+                                odl_port, openstack_sfc.get_compute_client(),
+                                [neutron_port],))
     try:
         t2.start()
     except Exception as e:
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 58323bf3..07f7814c 100644
--- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py
+++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py
@@ -187,7 +187,8 @@ def main():
     # Start measuring the time it takes to implement the classification rules
     t1 = threading.Thread(target=odl_utils.wait_for_classification_rules,
                           args=(ovs_logger, compute_nodes, odl_ip,
-                                odl_port, openstack_sfc.get_compute_client(),))
+                                odl_port, openstack_sfc.get_compute_client(),
+                                [neutron_port],))
     try:
         t1.start()
     except Exception as 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 5c5abb33..a5133f00 100644
--- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
+++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
@@ -185,7 +185,8 @@ def main():
     # Start measuring the time it takes to implement the classification rules
     t1 = threading.Thread(target=odl_utils.wait_for_classification_rules,
                           args=(ovs_logger, compute_nodes, odl_ip,
-                                odl_port, openstack_sfc.get_compute_client(),))
+                                odl_port, openstack_sfc.get_compute_client(),
+                                [neutron_port],))
 
     try:
         t1.start()
@@ -275,7 +276,8 @@ def main():
     # Start measuring the time it takes to implement the classification rules
     t2 = threading.Thread(target=odl_utils.wait_for_classification_rules,
                           args=(ovs_logger, compute_nodes, odl_ip,
-                                odl_port, openstack_sfc.get_compute_client(),))
+                                odl_port, openstack_sfc.get_compute_client(),
+                                [neutron_port],))
     try:
         t2.start()
     except Exception as e: