commit d55e84de33d9a273eb1fbf4e4587c123f72ac49f
author Charles Chan <rascov@gmail.com> Wed Mar 30 17:54:24 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 18 20:06:57 2016 +0000
tree 56989af265ca28430d75f0b7a36a0f3a30f6ef12
parent 338735b179aec696ad03ca6b73bfe252fec9eb87

CORD-348 multicast support in SegmentRouting and vRouter

In this submission:
* Setup/teardown multicast route according to SinkAdded/SinkRemoved event
    - ingressVlan and egressVlan is configurable through network config
* Change behavior of OFDPA VLAN assignment
    - Always use the VLAN in metadata if present
* Bugfix of writing immutable object

NOT in this submission (coming soon):
* Error handling (e.g. link/device failure recovery)

Change-Id: I9be11af04eb2d6456b865c7e59e96cc02370f846

apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java

diff --git a/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java b/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
index 989b297..b1b80c5 100644
--- a/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
+++ b/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
@@ -40,6 +40,7 @@
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
+import org.onosproject.net.config.NetworkConfigRegistry;
 import org.onosproject.net.config.NetworkConfigService;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceService;
@@ -105,6 +106,7 @@
     private final Set<Interface> interfaces = Sets.newHashSet();
     private InterfaceService interfaceService;
     private NetworkConfigService networkConfigService;
+    private NetworkConfigRegistry networkConfigRegistry;
     private FlowObjectiveService flowObjectiveService;
     private DeviceService deviceService;
     private static final ApplicationId APPID = TestApplicationId.create("foo");
@@ -128,13 +130,15 @@
         interfaceService = createMock(InterfaceService.class);
 
         networkConfigService = createMock(NetworkConfigService.class);
+        networkConfigRegistry = createMock(NetworkConfigRegistry.class);
         flowObjectiveService = createMock(FlowObjectiveService.class);
         deviceService = new TestDeviceService();
         CoreService coreService = createNiceMock(CoreService.class);
-        expect(coreService.registerApplication(anyString())).andReturn(APPID);
+        expect(coreService.registerApplication(anyString())).andReturn(APPID).anyTimes();
         replay(coreService);
 
         sSfibInstaller.networkConfigService = networkConfigService;
+        sSfibInstaller.networkConfigRegistry = networkConfigRegistry;
         sSfibInstaller.interfaceService = interfaceService;
         sSfibInstaller.flowObjectiveService = flowObjectiveService;
         sSfibInstaller.coreService = coreService;