commit 7fe5146cfec4cbe253fa8567e85841fa97552a86
author jjosep004c <Jobin_Joseph@comcast.com> Tue Aug 21 09:01:10 2018 -0400
committer Charles Chan <rascov@gmail.com> Tue Aug 21 17:33:53 2018 -0700
tree f5c55267854668f23746f43cc37fac0507602dcb
parent 988b2e78a03a142f4dfdbb15127b54d9bd792710

DHCP servers MAC remain unresolved for connectPoints until org.onosproject.dhcprelay app toggle

Change-Id: I8fc5104a80c9845710a3f5e7bae035f0a6762241

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index ec35eaa..4f0387d 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -1617,17 +1617,12 @@
     }
 
     private void hostUpdated(Host host, List<DhcpServerInfo> srverInfoList) {
-        DhcpServerInfo serverInfo;
-        Ip4Address targetIp;
-        if (!srverInfoList.isEmpty()) {
-            serverInfo = srverInfoList.get(0);
-            targetIp = serverInfo.getDhcpGatewayIp4().orElse(null);
+        srverInfoList.stream().forEach(serverInfo -> {
+            Ip4Address targetIp = serverInfo.getDhcpGatewayIp4().orElse(null);
             Ip4Address serverIp = serverInfo.getDhcpServerIp4().orElse(null);
-
             if (targetIp == null) {
                 targetIp = serverIp;
             }
-
             if (targetIp != null) {
                 if (host.ipAddresses().contains(targetIp)) {
                     serverInfo.setDhcpConnectMac(host.mac());
@@ -1635,7 +1630,7 @@
                     requestDhcpPacket(serverIp);
                 }
             }
-        }
+        });
     }
 
 
@@ -1651,13 +1646,9 @@
     }
 
     private void hostRemoved(Host host, List<DhcpServerInfo> serverInfoList) {
-        DhcpServerInfo serverInfo;
-        Ip4Address targetIp;
-        if (!serverInfoList.isEmpty()) {
-            serverInfo = serverInfoList.get(0);
+        serverInfoList.stream().forEach(serverInfo -> {
+            Ip4Address targetIp = serverInfo.getDhcpGatewayIp4().orElse(null);
             Ip4Address serverIp = serverInfo.getDhcpServerIp4().orElse(null);
-            targetIp = serverInfo.getDhcpGatewayIp4().orElse(null);
-
             if (targetIp == null) {
                 targetIp = serverIp;
             }
@@ -1669,7 +1660,7 @@
                     cancelDhcpPacket(serverIp);
                 }
             }
-        }
+        });
     }
 
     private void requestDhcpPacket(Ip4Address serverIp) {

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
index 5be7084..c2983c9 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -1429,12 +1429,9 @@
     }
 
     private void hostUpdated(Host host, List<DhcpServerInfo> serverInfoList) {
-        DhcpServerInfo serverInfo;
-        Ip6Address targetIp;
-        if (!serverInfoList.isEmpty()) {
-            serverInfo = serverInfoList.get(0);
+        serverInfoList.stream().forEach(serverInfo -> {
             Ip6Address serverIp = serverInfo.getDhcpServerIp6().orElse(null);
-            targetIp = serverInfo.getDhcpGatewayIp6().orElse(null);
+            Ip6Address targetIp = serverInfo.getDhcpGatewayIp6().orElse(null);
 
             if (targetIp == null) {
                 targetIp = serverIp;
@@ -1446,7 +1443,7 @@
                     requestDhcpPacket(serverIp);
                 }
             }
-        }
+        });
     }
     /**
      * Handle host removed.
@@ -1460,13 +1457,9 @@
     }
 
     private void hostRemoved(Host host, List<DhcpServerInfo> serverInfoList) {
-        DhcpServerInfo serverInfo;
-        Ip6Address targetIp;
-
-        if (!serverInfoList.isEmpty()) {
-            serverInfo = serverInfoList.get(0);
+        serverInfoList.stream().forEach(serverInfo -> {
             Ip6Address serverIp = serverInfo.getDhcpServerIp6().orElse(null);
-            targetIp = serverInfo.getDhcpGatewayIp6().orElse(null);
+            Ip6Address targetIp = serverInfo.getDhcpGatewayIp6().orElse(null);
 
             if (targetIp == null) {
                 targetIp = serverIp;
@@ -1478,7 +1471,7 @@
                     cancelDhcpPacket(serverIp);
                 }
             }
-        }
+        });
     }
 
    /**