Add FlowManager to the list of modules to be loaded on startup.
diff --git a/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java b/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
index e84e0f6..ec5e7e3 100644
--- a/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
+++ b/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
@@ -11,6 +11,7 @@
import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.counter.ICounterStoreService;
+import net.floodlightcontroller.flowcache.IFlowService;
import net.floodlightcontroller.mastership.IMastershipService;
import net.floodlightcontroller.perfmon.IPktInProcessingTimeService;
import net.floodlightcontroller.restserver.IRestApiService;
@@ -51,6 +52,7 @@
dependencies.add(ICounterStoreService.class);
dependencies.add(IThreadPoolService.class);
dependencies.add(IMastershipService.class);
+ dependencies.add(IFlowService.class);
return dependencies;
}
@@ -67,6 +69,7 @@
controller.setThreadPoolService(
context.getServiceImpl(IThreadPoolService.class));
controller.setMastershipService(context.getServiceImpl(IMastershipService.class));
+ controller.setFlowService(context.getServiceImpl(IFlowService.class));
controller.init(context.getConfigParams(this));
}
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index d9cc5e1..74e5fcf 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -65,6 +65,7 @@
import net.floodlightcontroller.core.util.ListenerDispatcher;
import net.floodlightcontroller.core.web.CoreWebRoutable;
import net.floodlightcontroller.counter.ICounterStoreService;
+import net.floodlightcontroller.flowcache.IFlowService;
import net.floodlightcontroller.mastership.IMastershipService;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.perfmon.IPktInProcessingTimeService;
@@ -190,6 +191,7 @@
protected IPktInProcessingTimeService pktinProcTime;
protected IThreadPoolService threadPool;
protected IMastershipService masterHelper;
+ protected IFlowService flowService;
// Configuration options
protected int openFlowPort = 6633;
@@ -392,9 +394,13 @@
this.threadPool = tp;
}
- public void setMastershipService(IMastershipService serviceImpl) {
- this.masterHelper = serviceImpl;
- }
+ public void setMastershipService(IMastershipService serviceImpl) {
+ this.masterHelper = serviceImpl;
+ }
+
+ public void setFlowService(IFlowService serviceImpl) {
+ this.flowService = serviceImpl;
+ }
@Override
public Role getRole() {
diff --git a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
index 44436f4..70ca11d 100644
--- a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
+++ b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
@@ -24,5 +24,4 @@
net.floodlightcontroller.core.test.MockThreadPoolService
net.floodlightcontroller.firewall.Firewall
net.floodlightcontroller.mastership.MastershipManager
-
-
+net.floodlightcontroller.flowcache.FlowManager