Bug 1811 Fixed the pipeline by moving L2Fwd to the end.

Change-Id: I4192003c7b24d7bfb39abbfbcaf0772bb473a2a3
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorImpl.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorImpl.java
index 5264c93b9064c2bd5c5a7c1f6a7e234d4190eb54..826a4bd9acef6cb9cad4978dc8dff2f903e184d0 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorImpl.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorImpl.java
@@ -57,9 +57,9 @@ public class PipelineOrchestratorImpl implements PipelineOrchestrator, Opendayli
                                                                 Service.LOAD_BALANCER,
                                                                 Service.ROUTING,
                                                                 Service.L2_REWRITE,
-                                                                Service.L2_FORWARDING,
                                                                 Service.EGRESS_ACL,
-                                                                Service.OUTBOUND_NAT
+                                                                Service.OUTBOUND_NAT,
+                                                                Service.L2_FORWARDING
                                                               );
     Map<Service, AbstractServiceInstance> serviceRegistry = Maps.newConcurrentMap();
     private volatile MdsalConsumer mdsalConsumer;

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/Service.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/Service.java
index f309b9869eda2fa04e79a66a0e551914e181bc1e..1467e10ee510125744f3064611461045c42fec13 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/Service.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/Service.java
@@ -21,9 +21,9 @@ public enum Service {
     ROUTING ((short) 60, "Distributed Virtual Routing (DVR)"),
     L3_FORWARDING ((short) 70, "Layer 3 forwarding/lookup service"),
     L2_REWRITE ((short) 80, "Layer2 rewrite service"),
-    L2_FORWARDING ((short) 90, "Layer2 mac,vlan based forwarding"),
-    EGRESS_ACL ((short) 100, "Egress Acces-control.Typically Openstack Ingress Security group policies are applied here."),
-    OUTBOUND_NAT ((short) 110, "SNAT for traffic accessing external network");
+    EGRESS_ACL ((short) 90, "Egress Acces-control.Typically Openstack Ingress Security group policies are applied here."),
+    OUTBOUND_NAT ((short) 100, "SNAT for traffic accessing external network"),
+    L2_FORWARDING ((short) 110, "Layer2 mac,vlan based forwarding");
 
     short table;
     String description;

diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorTest.java
index 7aec1eeaf47ae1e8f590bc7d67a3ebf80ba2a9b9..7dd7dc756c6b3fa418f3ecef4b2b28ce0bdde46f 100644 (file)
--- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorTest.java
+++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorTest.java
@@ -21,9 +21,9 @@ public class PipelineOrchestratorTest {
         assertEquals(orchestrator.getNextServiceInPipeline(Service.INGRESS_ACL), Service.LOAD_BALANCER);
         assertEquals(orchestrator.getNextServiceInPipeline(Service.LOAD_BALANCER), Service.ROUTING);
         assertEquals(orchestrator.getNextServiceInPipeline(Service.ROUTING), Service.L2_REWRITE);
-        assertEquals(orchestrator.getNextServiceInPipeline(Service.L2_REWRITE), Service.L2_FORWARDING);
-        assertEquals(orchestrator.getNextServiceInPipeline(Service.L2_FORWARDING), Service.EGRESS_ACL);
+        assertEquals(orchestrator.getNextServiceInPipeline(Service.L2_REWRITE), Service.EGRESS_ACL);
         assertEquals(orchestrator.getNextServiceInPipeline(Service.EGRESS_ACL), Service.OUTBOUND_NAT);
-        assertNull(orchestrator.getNextServiceInPipeline(Service.OUTBOUND_NAT));
+        assertEquals(orchestrator.getNextServiceInPipeline(Service.OUTBOUND_NAT), Service.L2_FORWARDING);
+        assertNull(orchestrator.getNextServiceInPipeline(Service.L2_FORWARDING));
     }
 }