Fix NPE triggered after disabling SG on a port

[netvirt.git] / openstack / net-virt-providers / src / test / java / org / opendaylight / netvirt / openstack / netvirt / providers / openflow13 / PipelineOrchestratorImplTest.java

diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/PipelineOrchestratorImplTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/PipelineOrchestratorImplTest.java
index 7fd1132486e00e363c5e155f8477bfd1203e4b10..002a7c2075932e9ce194f77c454bb107a4b37e61 100644 (file)
--- a/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/PipelineOrchestratorImplTest.java
+++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/PipelineOrchestratorImplTest.java
@@ -24,6 +24,7 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.netvirt.openstack.netvirt.api.NodeCacheManager;
 import org.opendaylight.netvirt.openstack.netvirt.api.Southbound;
+import org.opendaylight.netvirt.openstack.netvirt.providers.NetvirtProvidersProvider;
 import org.opendaylight.netvirt.utils.servicehelper.ServiceHelper;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -44,6 +45,7 @@ public class PipelineOrchestratorImplTest {
     @Test
     public void testGetTableOffset() {
         short tableOffset = 0;
+        NetvirtProvidersProvider.setTableOffset(tableOffset);
         assertEquals("tableOffset was not set", tableOffset, orchestrator.getTableOffset());
     }
 
@@ -52,6 +54,8 @@ public class PipelineOrchestratorImplTest {
      */
     @Test
     public void testGetTableOffsetWithService() {
+        short tableOffset = 0;
+        NetvirtProvidersProvider.setTableOffset(tableOffset);
         assertEquals("tableOffset was not set", Service.CLASSIFIER.getTable(),
                 orchestrator.getTable(Service.CLASSIFIER));
     }
@@ -92,6 +96,12 @@ public class PipelineOrchestratorImplTest {
                 Service.INBOUND_NAT);
         assertEquals(
                 orchestrator.getNextServiceInPipeline(Service.INBOUND_NAT),
+                Service.RESUBMIT_ACL_SERVICE);
+        assertEquals(
+                orchestrator.getNextServiceInPipeline(Service.RESUBMIT_ACL_SERVICE),
+                Service.ACL_LEARN_SERVICE);
+        assertEquals(
+                orchestrator.getNextServiceInPipeline(Service.ACL_LEARN_SERVICE),
                 Service.EGRESS_ACL);
         assertEquals(orchestrator.getNextServiceInPipeline(Service.EGRESS_ACL),
                 Service.LOAD_BALANCER);
@@ -110,6 +120,9 @@ public class PipelineOrchestratorImplTest {
                 Service.OUTBOUND_NAT);
         assertEquals(
                 orchestrator.getNextServiceInPipeline(Service.OUTBOUND_NAT),
+                Service.L2_LEARN);
+        assertEquals(
+                orchestrator.getNextServiceInPipeline(Service.L2_LEARN),
                 Service.L2_FORWARDING);
         assertNull(orchestrator.getNextServiceInPipeline(Service.L2_FORWARDING));
     }