commit f2565a9cbcaec0d11ceda2d123717514d53e4072
author Charles Chan <rascov@gmail.com> Wed Feb 10 20:46:58 2016 -0800
committer Jonathan Hart <jono@onlab.us> Thu Feb 18 17:32:30 2016 +0000
tree 8a193a4bd620e33827f4cbe1d8cf77d066b44b84
parent 5270ed0088decd871533f1d6117ef92f98698ef8

CORD-508 SegmentRouting / vRouter integration

- Added excludePorts config to SegmentRouting
    SR does not push VLAN filtering rule to excluded ports
    SR ignores hosts learned from excluded ports
- Use separate default route config
    Don't need to config 0/0 on the interface anymore

Change-Id: Iea75d60c2d5f5368e79652b1bf192a6ced49030d

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

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 10ac6d6..271ffa0 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -471,8 +471,9 @@
         }
 
         for (Port port : srManager.deviceService.getPorts(deviceId)) {
-            if (port.number().toLong() > 0 &&
-                    port.number().toLong() < SegmentRoutingService.OFPP_MAX &&
+            ConnectPoint cp = new ConnectPoint(deviceId, port.number());
+            // TODO: Handles dynamic port events when we are ready for dynamic config
+            if (!srManager.deviceConfiguration.excludedPorts().contains(cp) &&
                     port.isEnabled()) {
                 Ip4Prefix portSubnet = config.getPortSubnet(deviceId, port.number());
                 VlanId assignedVlan = (portSubnet == null)