commit fc1c22ed00231d6a39383ba2dc6569765495d05e
author Charles Chan <rascov@gmail.com> Thu Jul 19 09:52:01 2018 -0700
committer Charles Chan <charles@opennetworking.org> Wed Jul 25 21:52:22 2018 +0000
tree f4d0f62115095fe8bc57b195d9ae877f9a5930bc
parent 05b06bc68eaa4a13e2a36472de863dba3e35913e

Cancel DHCP packet request when DHCP relay app is being deactivated

Change-Id: Ic1c10e63471460893865962541806c88fcfdf22d

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 04a9967..7999466 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -212,8 +212,10 @@
         providerRegistry.unregister(this);
         hostService.removeListener(hostListener);
         defaultServerInfoList.forEach(this::stopMonitoringIps);
+        defaultServerInfoList.forEach(info -> info.getDhcpServerIp4().ifPresent(this::cancelDhcpPacket));
         defaultServerInfoList.clear();
         indirectServerInfoList.forEach(this::stopMonitoringIps);
+        indirectServerInfoList.forEach(info -> info.getDhcpServerIp4().ifPresent(this::cancelDhcpPacket));
         indirectServerInfoList.clear();
     }