commit 9bf4958e77c5001a1f491934865746c3bc14f3b8
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 a42778104450681efa8bc724eeacfa79c4775bc4
parent 746c34f6f2d09be9a49e9193d8e7133560c1e410

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

app/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java

diff --git a/app/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java b/app/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java
index 4f5f226..c8afeef 100644
--- a/app/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java
+++ b/app/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java
@@ -62,7 +62,7 @@
 
     private final VlanId v10 = VlanId.vlanId((short) 10);
     private final VlanId v20 = VlanId.vlanId((short) 20);
-    private final VlanId vInt = SegmentRoutingManager.INTERNAL_VLAN;
+    private VlanId vInt;
 
     private final Interface u10 = new Interface(null, new ConnectPoint(devId1, p1),
             null, null, null, v10, null, null);
@@ -80,6 +80,7 @@
         srManager.deviceConfiguration =  EasyMock.createMock(DeviceConfiguration.class);
         srManager.interfaceService = interfaceService;
         srManager.deviceService = deviceService;
+        vInt = srManager.getDefaultInternalVlan();
         rrp = new RoutingRulePopulator(srManager);
     }