From: Tomas Cechvala <tcechval@cisco.com>
Date: Mon, 18 Jan 2016 10:26:53 +0000 (+0100)
Subject: Bug 4987 - ExternalMapper flows not populated
X-Git-Tag: release/boron~255
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=82d5ff601ebd1ed647e3211f5ab8a629a37ee0c2;p=groupbasedpolicy.git

Bug 4987 - ExternalMapper flows not populated

 - fixed by removing redundant condition

Change-Id: I3d0e43c6abebab776b21a9c12c91a5a570d0e55c
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>
---

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ExternalMapper.java b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ExternalMapper.java
index a89d9de8e..b8ea58f5d 100755
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ExternalMapper.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ExternalMapper.java
@@ -70,10 +70,6 @@ public class ExternalMapper extends FlowTable {
     @Override
     public void sync(NodeId nodeId, OfWriter ofWriter) throws Exception {
 
-        if (ctx.getSwitchManager().getExternalPorts(nodeId).isEmpty()) {
-            LOG.trace("No external ports found for node: {}", nodeId);
-            return;
-        }
         // Default drop all
         ofWriter.writeFlow(nodeId, TABLE_ID, dropFlow(Integer.valueOf(1), null, TABLE_ID));
 
diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ExternalMapperTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ExternalMapperTest.java
index 08497d036..66792f1cf 100755
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ExternalMapperTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ExternalMapperTest.java
@@ -93,7 +93,8 @@ public class ExternalMapperTest extends FlowTableTest {
 
     @Test
     public void syncTestNoExternalPorts() throws Exception {
+        // we still need ExternalMapper flows (default output and default drop) to be generated
         mapper.sync(nodeId, ofWriter);
-        verify(ofWriter, never()).writeFlow(any(NodeId.class), any(Short.class), any(Flow.class));
+        verify(ofWriter, times(2)).writeFlow(any(NodeId.class), any(Short.class), any(Flow.class));
     }
 }