commit 671a7abc3305b4ff775e68e52d93bab8c2b735fa
author Jonghwan Hyun <jonghwan@opennetworking.org> Mon Apr 30 09:27:21 2018 -0700
committer Charles Chan <charles@opennetworking.org> Tue May 01 05:56:09 2018 +0000
tree 5a11624e71f76aedfbeda4a1fd57c9544909ae51
parent 9aaa34fc244b1303ae631ede667d98fac7547b0c

Bug fix in SegmentRouting

- Correctly program filtering objective for spine-facing ports in leaf switches.

Change-Id: I07ad3980b2e66cecf4c2dd5cfbf70243c7ad4f39

app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java

diff --git a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index d4a5b65..730d2d0 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -32,6 +32,7 @@
 import org.onosproject.net.flowobjective.Objective;
 import org.onosproject.net.flowobjective.ObjectiveContext;
 import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.intf.Interface;
 import org.onosproject.net.packet.PacketPriority;
 import org.onosproject.segmentrouting.DefaultRoutingHandler.PortFilterInfo;
 import org.onosproject.segmentrouting.config.DeviceConfigNotFoundException;
@@ -969,7 +970,7 @@
             if (!processSinglePortFiltersInternal(deviceId, portnum, true, untaggedVlan, install)) {
                 return false;
             }
-        } else if (srManager.linkService.getLinks(connectPoint).size() == 0) {
+        } else if (!hasIPConfiguration(connectPoint)) {
             // Filter for unconfigured upstream port, using INTERNAL_VLAN
             if (!processSinglePortFiltersInternal(deviceId, portnum, true, INTERNAL_VLAN, install)) {
                 return false;
@@ -1649,4 +1650,14 @@
         srManager.flowObjectiveService.forward(deviceId, fob.remove(context));
     }
 
+    /**
+     * Checks whether the specified port has IP configuration or not.
+     *
+     * @param cp ConnectPoint to check the existance of IP configuration
+     * @return true if the port has IP configuration; false otherwise.
+     */
+    private boolean hasIPConfiguration(ConnectPoint cp) {
+        Set<Interface> interfaces = srManager.interfaceService.getInterfacesByPort(cp);
+        return interfaces.stream().anyMatch(intf -> intf.ipAddressesList().size() > 0);
+    }
 }