commit 09c2c4d19b75da60bc8d841e3d5db7c340f5eb16
author Saurav Das <sauravdas@alumni.stanford.edu> Mon Aug 13 15:34:26 2018 -0700
committer Charles Chan <charles@opennetworking.org> Thu Aug 16 05:00:04 2018 +0000
tree f706540e5501b1ae305a4f34314780e46b3d028e
parent e3141545bae9480dc9f7a7158f8cc1d55912b121

Changing the default pw transport vlan to 4090 instead of 4093.

Also adding component config options for pw transport vlan and default internal vlan.

Change-Id: I8bb48530e46db8534b825eecd9aea781fe3f0de1

apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java

diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
index 604f868..0793984 100644
--- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
+++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
@@ -60,7 +60,6 @@
 import java.util.stream.Collectors;
 
 import static org.onosproject.net.flow.criteria.Criterion.Type.VLAN_VID;
-import static org.onosproject.segmentrouting.SegmentRoutingManager.INTERNAL_VLAN;
 
 /**
  * Utility class for Multicast Handler.
@@ -229,10 +228,11 @@
         // Reuse unicast VLAN if the port has subnet configured
         if (cp != null) {
             VlanId untaggedVlan = srManager.getInternalVlanId(cp);
-            return (untaggedVlan != null) ? untaggedVlan : INTERNAL_VLAN;
+            return (untaggedVlan != null) ? untaggedVlan
+                                          : srManager.getDefaultInternalVlan();
         }
         // Use DEFAULT_VLAN if none of the above matches
-        return SegmentRoutingManager.INTERNAL_VLAN;
+        return srManager.getDefaultInternalVlan();
     }
 
     /**