commit f975958f77cd21cd0814d350a906235b2d06c2ea
author Charles Chan <rascov@gmail.com> Fri Oct 20 19:09:16 2017 -0700
committer Charles Chan <charles@opennetworking.org> Tue Oct 31 00:09:59 2017 +0000
tree 80047e0deb0ec966fac77e80b445f18013e83787
parent fa4b2738fe4a8e906ffd7d4df06f7933a677c16e

Match VLAN_VID in TMAC table for mcast flows

Matching VLAN_VID in TMAC table is mandatory on QMX switches
XGS switches support optional VLAN_VID matching so this patch is effective for both platforms

In addition,
- Take native vlan into account when assigning VLAN for untagged multicast traffic
- Fix a bug that puts wrong eth_type in TMAC table

Change-Id: I19caf2d6d69096a96b75cb528b6ed37b28d7d988

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 bbbbc3c..a51d2f4 100644
--- a/src/main/java/org/onosproject/segmentrouting/McastHandler.java
+++ b/src/main/java/org/onosproject/segmentrouting/McastHandler.java
@@ -774,7 +774,7 @@
         }
         // Reuse unicast VLAN if the port has subnet configured
         if (cp != null) {
-            VlanId untaggedVlan = srManager.getUntaggedVlanId(cp);
+            VlanId untaggedVlan = srManager.getInternalVlanId(cp);
             return (untaggedVlan != null) ? untaggedVlan : INTERNAL_VLAN;
         }
         // Use DEFAULT_VLAN if none of the above matches