Cleanup the TopoRouteService so it is not a Floodlight module anymore.
diff --git a/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java b/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
index c6d89a9..c821339 100644
--- a/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
+++ b/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
@@ -15,7 +15,6 @@
import net.floodlightcontroller.restserver.IRestApiService;
import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.threadpool.IThreadPoolService;
-import net.onrc.onos.ofcontroller.core.INetMapTopologyService.ITopoRouteService;
import net.onrc.onos.ofcontroller.flowmanager.IFlowService;
import net.onrc.onos.registry.controller.IControllerRegistryService;
@@ -54,7 +53,6 @@
dependencies.add(IThreadPoolService.class);
// Following added by ONOS
dependencies.add(IFlowService.class);
- dependencies.add(ITopoRouteService.class);
dependencies.add(IControllerRegistryService.class);
return dependencies;
@@ -74,7 +72,6 @@
context.getServiceImpl(IThreadPoolService.class));
// Following added by ONOS
controller.setFlowService(context.getServiceImpl(IFlowService.class));
- controller.setTopoRouteService(context.getServiceImpl(ITopoRouteService.class));
controller.setMastershipService(
context.getServiceImpl(IControllerRegistryService.class));
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index e40f24a..ac29983 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -74,7 +74,6 @@
import net.floodlightcontroller.storage.StorageException;
import net.floodlightcontroller.threadpool.IThreadPoolService;
import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
-import net.onrc.onos.ofcontroller.core.INetMapTopologyService.ITopoRouteService;
import net.onrc.onos.ofcontroller.flowmanager.IFlowService;
import net.onrc.onos.registry.controller.IControllerRegistryService;
import net.onrc.onos.registry.controller.IControllerRegistryService.ControlChangeCallback;
@@ -146,7 +145,7 @@
* - Detailed Port event: PORTCHANGED -> {PORTCHANGED, PORTADDED, PORTREMOVED}
* Available as net.onrc.onos.ofcontroller.core.IOFSwitchPortListener
* - Distributed ownership control of switch through RegistryService(IControllerRegistryService)
- * - Register ONOS services. (IFlowService, ITopoRouteService, IControllerRegistryService)
+ * - Register ONOS services. (IFlowService, IControllerRegistryService)
* - Additional DEBUG logs
* - Try using hostname as controller ID, when ID was not explicitly given.
*/
@@ -189,7 +188,6 @@
protected IPktInProcessingTimeService pktinProcTime;
protected IThreadPoolService threadPool;
protected IFlowService flowService;
- protected ITopoRouteService topoRouteService;
protected IControllerRegistryService registryService;
// Configuration options
@@ -418,10 +416,6 @@
this.flowService = serviceImpl;
}
- public void setTopoRouteService(ITopoRouteService serviceImpl) {
- this.topoRouteService = serviceImpl;
- }
-
public void setMastershipService(IControllerRegistryService serviceImpl) {
this.registryService = serviceImpl;
}