Fixed bug with router-ARP flows where code was in wrong IF scope.

Change-Id: I4f26e9979ada2a40b29eeac1bc653eff17497fee
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
index a4c94be61bdf6c86375b2f63026f5f58c7111bcf..ba2aa22ef8b1516f0314d325e6ba1119c101ed67 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
@@ -191,9 +191,9 @@ public class DestinationMapper extends FlowTable {
                                 groupAction(Long.valueOf(fdId)))));
                 writeFlow(t, tiid, flow.build());
             }
-            for (Subnet sn : sns) {
-                writeRouterArpFlow(t, tiid, flowMap, nodeId, sn, l3Id);
-            }
+        }
+        for (Subnet sn : sns) {
+            writeRouterArpFlow(t, tiid, flowMap, nodeId, sn, l3Id);
         }
     }
 

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapperTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapperTest.java
index 2474bc8ba0f16a9f2cf72b5c083596512de08619..5ef124521415e644ed6fa6e82020ff8bcf9b6715 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapperTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapperTest.java
@@ -234,7 +234,7 @@ public class DestinationMapperTest extends FlowTableTest {
         // DestinationMapper now checking for GroupTable entries. Flows will not be written.
         // TODO: alagalah to resolve correct unit tests.
         //        assertEquals(9, count);
-        assertEquals(5, count);
+        assertEquals(8, count);
 
         t = dosync(flowMap);
         verify(t, never()).put(any(LogicalDatastoreType.class),