commit f276052770b145b3aca7dd316a9ebcc3a576cedf
author Hyunsun Moon <hyunsun.moon@gmail.com> Fri Mar 04 19:24:08 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Mar 07 17:28:37 2016 +0000
tree 8377e44b759c720c24a8f62fb200dcf1abfad085
parent dae16fdc0796d82e1e2a35c64470a130d9e8000e

CORD-563 Remove stale IP addresses on br-int

Change-Id: Idee5b32febd527963a630af21750985c3b074147

src/main/java/org/onosproject/cordvtn/CordVtnNodeManager.java

diff --git a/src/main/java/org/onosproject/cordvtn/CordVtnNodeManager.java b/src/main/java/org/onosproject/cordvtn/CordVtnNodeManager.java
index 954e55b..4802db8 100644
--- a/src/main/java/org/onosproject/cordvtn/CordVtnNodeManager.java
+++ b/src/main/java/org/onosproject/cordvtn/CordVtnNodeManager.java
@@ -631,6 +631,11 @@
             return;
         }
 
+        RemoteIpCommandUtil.getCurrentIps(session, DEFAULT_BRIDGE).stream()
+                .filter(ip -> !ip.equals(node.localMgmtIp().ip()))
+                .filter(ip -> !ip.equals(node.dpIp().ip()))
+                .forEach(ip -> RemoteIpCommandUtil.deleteIp(session, ip, DEFAULT_BRIDGE));
+
         boolean result = RemoteIpCommandUtil.flushIp(session, node.dpIntf()) &&
                 RemoteIpCommandUtil.setInterfaceUp(session, node.dpIntf()) &&
                 RemoteIpCommandUtil.addIp(session, node.dpIp(), DEFAULT_BRIDGE) &&