Fix bug where SDN-IP installs more intents than needed

Change-Id: Ic085d5033105e0c688369a71de077c7541d26dbf

Fix bug where SDN-IP installs more intents than needed
Change-Id: Ic085d5033105e0c688369a71de077c7541d26dbf
Jonathan Hart
Commit 1258f86b564be76771c5cd6e1f807c4bc529168a 1258f86b 1 parent f05b607b
Showing 1 changed file with 9 additions and 3 deletions
apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
View file @1258f86
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
View file @1258f86
@@ -26,6 +26,7 @@ import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
+ import org.onosproject.net.host.InterfaceIpAddress;
 import org.onosproject.net.intent.PointToPointIntent;
 import org.onosproject.routing.config.BgpPeer;
 import org.onosproject.routing.config.BgpSpeaker;
@@ -148,9 +149,14 @@ public class PeerConnectivityManager {
 
         IpAddress bgpdAddress = null;
         for (InterfaceAddress interfaceAddress : interfaceAddresses) {
-             if (interfaceAddress.connectPoint().equals(
-                     peerInterface.connectPoint())) {
-                 bgpdAddress = interfaceAddress.ipAddress();
+             if (interfaceAddress.connectPoint().equals(peerInterface.connectPoint())) {
+                 for (InterfaceIpAddress interfaceIpAddress : peerInterface.ipAddresses()) {
+                     // Only add intents where the peer and ONOS's addresses are
+                     // in the same subnet
+                     if (interfaceIpAddress.subnetAddress().contains(bgpPeer.ipAddress())) {
+                         bgpdAddress = interfaceAddress.ipAddress();
+                     }
+                 }
                 break;
             }
         }