BUG 7729: Remove redundant tunnel drop flow in table 110

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

diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/L2FowardingServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/L2FowardingServiceTest.java
index 55c1970071102328a5328809d7dc4c98b3081cdf..0854135ae80dd8f88e6506353c9f2ab189941eff 100644 (file)
--- a/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/L2FowardingServiceTest.java
+++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/L2FowardingServiceTest.java
@@ -148,22 +148,6 @@ public class L2FowardingServiceTest {
         verify(commitFuture, times(2)).get(); // 1 + 1 above
     }
 
-    /**
-     * Test method {@link L2ForwardingService#programLocalTableMiss(Long, String, boolean)}
-     */
-    @Test
-    public void testProgramLocalTableMiss() throws Exception {
-        l2ForwardingService.programLocalTableMiss(DPID, SEGMENTATION_ID, true);
-        verify(writeTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean());
-        verify(writeTransaction, times(1)).submit();
-        verify(commitFuture, times(1)).get();
-
-        l2ForwardingService.programLocalTableMiss(DPID, SEGMENTATION_ID, false);
-        verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class));
-        verify(writeTransaction, times(2)).submit();
-        verify(commitFuture, times(2)).get(); // 1 + 1 above
-    }
-
     /**
      * Test method {@link L2ForwardingService#programLocalVlanTableMiss(Long, String, boolean)}
      */
@@ -228,49 +212,17 @@ public class L2FowardingServiceTest {
         verify(commitFuture, times(2)).get(); // 1 + 1 above
     }
 
-    /**
-     * Test method {@link L2ForwardingService#programVlanFloodOut(Long, String, Long, boolean)}
-     */
-    @Test
-    public void testProgramVlanFloodOut() throws Exception {
-        l2ForwardingService.programVlanFloodOut(DPID, SEGMENTATION_ID, ETH_PORT, true);
-        verify(writeTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean());
-        verify(writeTransaction, times(1)).submit();
-        verify(commitFuture, times(1)).get();
-
-        l2ForwardingService.programVlanFloodOut(DPID, SEGMENTATION_ID, ETH_PORT, false);
-        verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class));
-        verify(writeTransaction, times(2)).submit();
-        verify(commitFuture, times(2)).get(); // 1 + 1 above
-    }
-
-    /**
-    * Test method {@link L2ForwardingService#programTunnelMiss(Long, String, boolean)}
-    */
-   @Test
-   public void testProgramTunnelMiss() throws Exception {
-       l2ForwardingService.programTunnelMiss(DPID, SEGMENTATION_ID, true);
-       verify(writeTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean());
-       verify(writeTransaction, times(1)).submit();
-       verify(commitFuture, times(1)).get();
-
-       l2ForwardingService.programTunnelMiss(DPID, SEGMENTATION_ID, false);
-       verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class));
-       verify(writeTransaction, times(2)).submit();
-       verify(commitFuture, times(2)).get(); // 1 + 1 above
-   }
-
    /**
     * Test method {@link L2ForwardingService#programVlanMiss(Long, String, Long, boolean)}
     */
    @Test
    public void testProgramVlanMiss() throws Exception {
-       l2ForwardingService.programTunnelMiss(DPID, SEGMENTATION_ID, true);
+       l2ForwardingService.programVlanMiss(DPID, SEGMENTATION_ID, ETH_PORT, true);
        verify(writeTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean());
        verify(writeTransaction, times(1)).submit();
        verify(commitFuture, times(1)).get();
 
-       l2ForwardingService.programTunnelMiss(DPID, SEGMENTATION_ID, false);
+       l2ForwardingService.programVlanMiss(DPID, SEGMENTATION_ID, ETH_PORT, false);
        verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class));
        verify(writeTransaction, times(2)).submit();
        verify(commitFuture, times(2)).get(); // 1 + 1 above