commit c679a02995362efdee00b9ff240321e5a56bb1c0
author Mayank Tiwari <mike.tiwari@gmail.com> Sat Jun 23 11:19:08 2018 -0400
committer Charles Chan <charles@opennetworking.org> Mon Jun 25 17:58:57 2018 +0000
tree 3cc20d61ab5e2889c5739eef0d501f44d09d13d2
parent 803a1d5aaf85cd4a5d1979c5958d7405fe8ced15

Fixed issues related to published routes learnt back on FPM

Change-Id: I885a368d171180c5febc245e80e99d84463676d2

apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java

diff --git a/apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java b/apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java
index 5cfb911..faa2c80 100644
--- a/apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java
+++ b/apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java
@@ -304,13 +304,16 @@
                         .map(IpAddress::getIp4Address)
                         .findFirst()
                         .orElse(null);
+                    log.debug("RUR IPv4 address extracted from netcfg is: {}", rurIPv4Address);
                     if (rurIPv4Address != null) {
                         pdPushNextHopIPv4.add(rurIPv4Address);
+                    } else {
+                        log.debug("Unable to extract RUR IPv4 address from netcfg");
                     }
 
                 }
 
-                if (pdPushNextHopIPv6.size() == 0) {
+                if (pdPushNextHopIPv6 == null || pdPushNextHopIPv6.size() == 0) {
                     rurIPv6Address = interfaceService.getInterfaces()
                         .stream()
                         .filter(iface -> iface.name().contains("RUR"))
@@ -321,8 +324,11 @@
                         .map(IpAddress::getIp6Address)
                         .findFirst()
                         .orElse(null);
+                    log.debug("RUR IPv6 address extracted from netcfg is: {}", rurIPv6Address);
                     if (rurIPv6Address != null) {
                         pdPushNextHopIPv6.add(rurIPv6Address);
+                    } else {
+                        log.debug("Unable to extract RUR IPv6 address from netcfg");
                     }
                 }
 
@@ -453,8 +459,8 @@
         IpPrefix prefix = IpPrefix.valueOf(dstAddress, rtNetlink.dstLength());
 
         // Ignore routes that we sent.
-        if (gateway != null && ((prefix.isIp4() && (gateway.equals(pdPushNextHopIPv4))) ||
-            gateway.equals(pdPushNextHopIPv6))) {
+        if (gateway != null && ((prefix.isIp4() && (pdPushNextHopIPv4.contains(gateway))) ||
+                pdPushNextHopIPv6.contains(gateway))) {
             if (routeInDhcpStore(prefix) || routeInRipStore(prefix)) {
                 return;
             }