Fix vRouter app IDs and deactivation of components.
CORD-710.
Change-Id: I66da47eef8ec5978c3f36447be4d12f6f07f88f8
diff --git a/apps/routing/fibinstaller/src/test/java/org/onosproject/routing/fibinstaller/SingleSwitchFibInstallerTest.java b/apps/routing/fibinstaller/src/test/java/org/onosproject/routing/fibinstaller/FibInstallerTest.java
similarity index 97%
rename from apps/routing/fibinstaller/src/test/java/org/onosproject/routing/fibinstaller/SingleSwitchFibInstallerTest.java
rename to apps/routing/fibinstaller/src/test/java/org/onosproject/routing/fibinstaller/FibInstallerTest.java
index f7736f7..e17d779 100644
--- a/apps/routing/fibinstaller/src/test/java/org/onosproject/routing/fibinstaller/SingleSwitchFibInstallerTest.java
+++ b/apps/routing/fibinstaller/src/test/java/org/onosproject/routing/fibinstaller/FibInstallerTest.java
@@ -81,7 +81,7 @@
/**
* Unit tests for SingleSwitchFibInstaller.
*/
-public class SingleSwitchFibInstallerTest {
+public class FibInstallerTest {
private static final DeviceId DEVICE_ID = DeviceId.deviceId("of:0000000000000001");
@@ -118,12 +118,12 @@
private DeviceListener deviceListener;
private RouterConfig routerConfig;
- private SingleSwitchFibInstaller sSfibInstaller;
+ private FibInstaller sSfibInstaller;
private InterfaceListener interfaceListener;
@Before
public void setUp() throws Exception {
- sSfibInstaller = new SingleSwitchFibInstaller();
+ sSfibInstaller = new FibInstaller();
sSfibInstaller.componentConfigService = createNiceMock(ComponentConfigService.class);
@@ -225,7 +225,7 @@
.setVlanPcp((byte) 0);
} else {
metabuilder = DefaultTrafficSelector.builder();
- metabuilder.matchVlanId(VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN));
+ metabuilder.matchVlanId(VlanId.vlanId(FibInstaller.ASSIGNED_VLAN));
}
treatment.setOutput(port);
@@ -391,7 +391,7 @@
private class TestRouteService extends RouteServiceAdapter {
@Override
public void addListener(RouteListener listener) {
- SingleSwitchFibInstallerTest.this.routeListener = listener;
+ FibInstallerTest.this.routeListener = listener;
}
}
@@ -425,7 +425,7 @@
@Override
public void addListener(DeviceListener listener) {
- SingleSwitchFibInstallerTest.this.deviceListener = listener;
+ FibInstallerTest.this.deviceListener = listener;
}
}
}