From: Madhu Venugopal <mavenugo@gmail.com>
Date: Thu, 11 Sep 2014 13:06:36 +0000 (-0700)
Subject: Bug 1811 Fixed the pipeline by moving L2Fwd to the end.
X-Git-Tag: release/helium~47^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2db32f018dd73393de5f142f38d719795528bb67;p=ovsdb.git

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 5264c93b9..826a4bd9a 100644
--- 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 f309b9869..1467e10ee 100644
--- 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 7aec1eeaf..7dd7dc756 100644
--- 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));
     }
 }