commit 779fd0623323e8954e2bb6dab601ee34e561817d
author Charles Chan <rascov@gmail.com> Wed May 11 20:39:35 2016 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Fri May 13 17:03:57 2016 +0000
tree 04b710d4db15b8c98dff598f5fdb0fc29f61b89b
parent c22cef3263fbcfd237ea47f9d9f748747c04cf11

CORD-135 Support Multicast Source on a Configured Port

Change-Id: I71965dbb649a798cd1991bcb4d921919a30420d5

src/main/java/org/onosproject/segmentrouting/McastHandler.java

diff --git a/src/main/java/org/onosproject/segmentrouting/McastHandler.java b/src/main/java/org/onosproject/segmentrouting/McastHandler.java
index 8139e27..d3d8759 100644
--- a/src/main/java/org/onosproject/segmentrouting/McastHandler.java
+++ b/src/main/java/org/onosproject/segmentrouting/McastHandler.java
@@ -20,6 +20,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.onlab.packet.Ethernet;
+import org.onlab.packet.Ip4Prefix;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
@@ -352,14 +353,19 @@
             return;
         }
 
+        // Reuse unicast VLAN if the port has subnet configured
+        Ip4Prefix portSubnet = srManager.deviceConfiguration.getPortSubnet(deviceId, port);
+        VlanId unicastVlan = srManager.getSubnetAssignedVlanId(deviceId, portSubnet);
+        final VlanId finalVlanId = (unicastVlan != null) ? unicastVlan : assignedVlan;
+
         FilteringObjective.Builder filtObjBuilder =
-                filterObjBuilder(deviceId, port, assignedVlan);
+                filterObjBuilder(deviceId, port, finalVlanId);
         ObjectiveContext context = new DefaultObjectiveContext(
                 (objective) -> log.debug("Successfully add filter on {}/{}, vlan {}",
-                        deviceId, port.toLong(), assignedVlan),
+                        deviceId, port.toLong(), finalVlanId),
                 (objective, error) ->
                         log.warn("Failed to add filter on {}/{}, vlan {}: {}",
-                                deviceId, port.toLong(), assignedVlan, error));
+                                deviceId, port.toLong(), finalVlanId, error));
         srManager.flowObjectiveService.filter(deviceId, filtObjBuilder.add(context));
     }