Fix skip processing DHCP relay for external subnet

By default every subnet was processed for dhcp relay in FDS DVR scenario.
This is not needed for external networks. This patch fixes processing of
DHCP relay for external networks.

Change-Id: I54a143d67eb40e259adcfff6b90fcd5e8115c46b
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/dhcp/DhcpRelayHandler.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/dhcp/DhcpRelayHandler.java
index 98425a13fccca96fa782e94a31ae6c3042bd5251..9ee97fd67abbb18ac21e1ac02cada9a4d3b69617 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/dhcp/DhcpRelayHandler.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/dhcp/DhcpRelayHandler.java
@@ -67,7 +67,7 @@ public class DhcpRelayHandler {
                         LOG.warn("DHCP Relay was not configured: {}", dhcpRelayCommand);
                     }
                 } else {
-                    LOG.warn("DHCP server IP address was not found for node: {}. Skipping processing", vppNode);
+                    LOG.trace("DHCP server IP address was not found for node: {}. Skipping processing", vppNode);
                 }
             }
 

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/ForwardingManager.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/ForwardingManager.java
index d2e0ac45b7f7b58f2703b541958b06dcd1c31d51..e1c2e5e92c91d65407630eea2cf6b45f268bb072 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/ForwardingManager.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/ForwardingManager.java
@@ -543,9 +543,11 @@ public final class ForwardingManager {
             for (RendererNetworkDomain networkDomain : forwardingByTenant.getRendererNetworkDomain()) {
                 org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.l2_l3.rev170511.has.subnet.Subnet
                     subnet = networkDomain.getAugmentation((SubnetAugmentRenderer.class)).getSubnet();
-                LOG.trace("Creating Dhcp Relay from subnet: {}, vrfid: {}, vppNodesByL2Fd: {}", subnet, vni_vrfid,
-                    vppNodesByL2Fd);
-                dhcpRelayHandler.createIpv4DhcpRelay(vni_vrfid, subnet, vppNodesByL2Fd);
+                if (subnet.isIsTenant()) {
+                    LOG.trace("Creating Dhcp Relay from subnet: {}, vrfid: {}, vppNodesByL2Fd: {}", subnet, vni_vrfid,
+                        vppNodesByL2Fd);
+                    dhcpRelayHandler.createIpv4DhcpRelay(vni_vrfid, subnet, vppNodesByL2Fd);
+                }
             }
         }
     }
@@ -556,7 +558,9 @@ public final class ForwardingManager {
             for (RendererNetworkDomain networkDomain : forwardingByTenant.getRendererNetworkDomain()) {
                 org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.l2_l3.rev170511.has.subnet.Subnet
                     subnet = networkDomain.getAugmentation((SubnetAugmentRenderer.class)).getSubnet();
-                dhcpRelayHandler.deleteIpv4DhcpRelay(vni_vrfid, subnet, vppNodesByL2Fd);
+                if (subnet.isIsTenant()) {
+                    dhcpRelayHandler.deleteIpv4DhcpRelay(vni_vrfid, subnet, vppNodesByL2Fd);
+                }
             }
         }
     }