Merged registry code into master
diff --git a/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java b/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
index 5c847b7..cd15927 100644
--- a/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
+++ b/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
@@ -13,11 +13,11 @@
import net.floodlightcontroller.core.INetMapTopologyService.ITopoRouteService;
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;
import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.threadpool.IThreadPoolService;
+import net.onrc.onos.registry.controller.IControllerRegistryService;
public class FloodlightProvider implements IFloodlightModule {
Controller controller;
@@ -52,9 +52,10 @@
dependencies.add(IRestApiService.class);
dependencies.add(ICounterStoreService.class);
dependencies.add(IThreadPoolService.class);
- dependencies.add(IMastershipService.class);
dependencies.add(IFlowService.class);
dependencies.add(ITopoRouteService.class);
+ dependencies.add(IControllerRegistryService.class);
+
return dependencies;
}
@@ -70,9 +71,11 @@
context.getServiceImpl(IRestApiService.class));
controller.setThreadPoolService(
context.getServiceImpl(IThreadPoolService.class));
- controller.setMastershipService(context.getServiceImpl(IMastershipService.class));
controller.setFlowService(context.getServiceImpl(IFlowService.class));
controller.setTopoRouteService(context.getServiceImpl(ITopoRouteService.class));
+ controller.setMastershipService(
+ context.getServiceImpl(IControllerRegistryService.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 cbcd9a0..78b93ed 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -67,7 +67,6 @@
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;
import net.floodlightcontroller.restserver.IRestApiService;
@@ -77,6 +76,7 @@
import net.floodlightcontroller.storage.OperatorPredicate;
import net.floodlightcontroller.storage.StorageException;
import net.floodlightcontroller.threadpool.IThreadPoolService;
+import net.onrc.onos.registry.controller.IControllerRegistryService;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -191,9 +191,9 @@
protected IStorageSourceService storageSource;
protected IPktInProcessingTimeService pktinProcTime;
protected IThreadPoolService threadPool;
- protected IMastershipService masterHelper;
protected IFlowService flowService;
protected ITopoRouteService topoRouteService;
+ protected IControllerRegistryService masterHelper;
// Configuration options
protected int openFlowPort = 6633;
@@ -396,10 +396,6 @@
this.threadPool = tp;
}
- public void setMastershipService(IMastershipService serviceImpl) {
- this.masterHelper = serviceImpl;
- }
-
public void setFlowService(IFlowService serviceImpl) {
this.flowService = serviceImpl;
}
@@ -407,6 +403,10 @@
public void setTopoRouteService(ITopoRouteService serviceImpl) {
this.topoRouteService = serviceImpl;
}
+
+ public void setMastershipService(IControllerRegistryService serviceImpl) {
+ this.masterHelper = serviceImpl;
+ }
@Override
public Role getRole() {
diff --git a/src/main/java/net/floodlightcontroller/mastership/IMastershipHelper.java b/src/main/java/net/floodlightcontroller/mastership/IMastershipHelper.java
deleted file mode 100644
index b4becfa..0000000
--- a/src/main/java/net/floodlightcontroller/mastership/IMastershipHelper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package net.floodlightcontroller.mastership;
-
-public interface IMastershipHelper {
-
- // Callback for all mastership changes.
- // Change callback is called when mastership is acquired or released
- public interface MastershipCallback {
- public void changeCallback(long dpid);
- }
-
- // Set/get mastership identifier. This is used to set the unique identifier of the controller that is asking for mastership.
- // It needs to be set first before any mastership call can be made
- public void setMastershipId (String id);
- public String getMastershipId ();
-
- // Request mastership for a switch. Our request for mastership remains in a queue. If we win mastership, the callback
- // is called. This call is non-blocking and can be called from the packet processing context as well.
- public void requestMastership(long dpid, MastershipCallback cb);
-
- // Release mastership for a switch. If we are the master, then the mastership will be released and given to the next
- // controller who had requested mastership. If we are not the master our request for mastership will be
- // removed from the queue.
- public void releaseMastership(long dpid);
-
- // Check if I am the master of a switch and return true if I am the master.
- public boolean amMaster(long dpid);
-}
diff --git a/src/main/java/net/floodlightcontroller/mastership/IMastershipService.java b/src/main/java/net/floodlightcontroller/mastership/IMastershipService.java
deleted file mode 100644
index cc0ddf4..0000000
--- a/src/main/java/net/floodlightcontroller/mastership/IMastershipService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package net.floodlightcontroller.mastership;
-
-import java.util.Collection;
-
-import net.floodlightcontroller.core.module.IFloodlightService;
-
-//Will change to something like IRegistryService
-public interface IMastershipService extends IFloodlightService {
-
- // Callback for all mastership changes.
- // Change callback is called when mastership is acquired or released
- public interface MastershipCallback {
- public void changeCallback(long dpid, boolean isMaster);
- }
-
- // Acquire mastership for a switch.
- public void acquireMastership(long dpid, MastershipCallback cb) throws Exception;
-
- // Release mastership for a switch
- public void releaseMastership(long dpid);
-
- // Check if I am the master of a switch. This is a nonblocking call that checks if the caller is a
- public boolean amMaster(long dpid);
-
- // Set/Get mastership identifier.
- // This is typically a unique identifier of the controller that does not change across restarts
- public void setMastershipId (String id);
- public String getMastershipId ();
-
- /**
- * Register a controller to the ONOS cluster
- * @param controller A string identifying the controller and (possibly) how to talk to it.
- * (We will have to develop a convention for this - most likely hostname:port)
- */
- public void registerController(String controllerId) throws Exception;
-
- /**
- * Get all controllers in the cluster
- * @return
- */
- public Collection<String> getAllControllers() throws Exception;
-
-
- public String getControllerForSwitch(long dpid) throws Exception;
-
- public Collection<Long> getSwitchesControlledByController(String controllerId);
-}
diff --git a/src/main/java/net/floodlightcontroller/mastership/MastershipHelper.java b/src/main/java/net/floodlightcontroller/mastership/MastershipHelper.java
deleted file mode 100644
index fdac8ca..0000000
--- a/src/main/java/net/floodlightcontroller/mastership/MastershipHelper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package net.floodlightcontroller.mastership;
-
-public class MastershipHelper implements IMastershipHelper {
-
- @Override
- public void setMastershipId(String id) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public String getMastershipId() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void requestMastership(long dpid, MastershipCallback cb) {
- // TODO Auto-generated method stub
- return;
- }
-
- @Override
- public void releaseMastership(long dpid) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public boolean amMaster(long dpid) {
- // TODO Auto-generated method stub
- return false;
- }
-
-}
diff --git a/src/main/java/net/floodlightcontroller/mastership/MastershipManager.java b/src/main/java/net/floodlightcontroller/mastership/MastershipManager.java
deleted file mode 100644
index bff588b..0000000
--- a/src/main/java/net/floodlightcontroller/mastership/MastershipManager.java
+++ /dev/null
@@ -1,328 +0,0 @@
-package net.floodlightcontroller.mastership;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.floodlightcontroller.core.module.FloodlightModuleContext;
-import net.floodlightcontroller.core.module.FloodlightModuleException;
-import net.floodlightcontroller.core.module.IFloodlightModule;
-import net.floodlightcontroller.core.module.IFloodlightService;
-
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.openflow.util.HexString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.curator.RetryPolicy;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.framework.api.CuratorWatcher;
-import com.netflix.curator.framework.recipes.cache.ChildData;
-import com.netflix.curator.framework.recipes.cache.PathChildrenCache;
-import com.netflix.curator.framework.recipes.cache.PathChildrenCache.StartMode;
-import com.netflix.curator.framework.recipes.leader.LeaderLatch;
-import com.netflix.curator.framework.recipes.leader.Participant;
-import com.netflix.curator.retry.ExponentialBackoffRetry;
-
-public class MastershipManager implements IFloodlightModule, IMastershipService {
-
- protected static Logger log = LoggerFactory.getLogger(MastershipManager.class);
- protected String mastershipId = null;
-
- //TODO read this from configuration
- protected String connectionString = "localhost:2181";
- private final String namespace = "onos";
- private final String switchLatchesPath = "/switches";
-
- protected CuratorFramework client;
-
- private final String controllerPath = "/controllers";
- protected PathChildrenCache controllerCache;
-
- protected Map<String, LeaderLatch> switchLatches;
- protected Map<String, MastershipCallback> switchCallbacks;
-
- protected class ParamaterizedCuratorWatcher implements CuratorWatcher {
- private String dpid;
- private boolean isLeader = false;
- private String latchPath;
-
- public ParamaterizedCuratorWatcher(String dpid, String latchPath){
- this.dpid = dpid;
- this.latchPath = latchPath;
- }
-
- @Override
- public synchronized void process(WatchedEvent event) throws Exception {
- log.debug("Watch Event: {}", event);
-
- LeaderLatch latch = switchLatches.get(dpid);
-
- if (event.getState() == KeeperState.Disconnected){
- if (isLeader) {
- log.debug("Disconnected while leader - lost leadership for {}", dpid);
-
- isLeader = false;
- switchCallbacks.get(dpid).changeCallback(HexString.toLong(dpid), false);
- }
- return;
- }
-
- try {
-
- Participant leader = latch.getLeader();
-
- if (leader.getId().equals(mastershipId) && !isLeader){
- log.debug("Became leader for {}", dpid);
-
- isLeader = true;
- switchCallbacks.get(dpid).changeCallback(HexString.toLong(dpid), true);
- }
- else if (!leader.getId().equals(mastershipId) && isLeader){
- log.debug("Lost leadership for {}", dpid);
-
- isLeader = false;
- switchCallbacks.get(dpid).changeCallback(HexString.toLong(dpid), false);
- }
- } catch (Exception e){
- if (isLeader){
- log.debug("Exception checking leadership status. Assume leadship lost for {}",
- dpid);
-
- isLeader = false;
- switchCallbacks.get(dpid).changeCallback(HexString.toLong(dpid), false);
- }
- }
-
- client.getChildren().usingWatcher(this).inBackground().forPath(latchPath);
- //client.getChildren().usingWatcher(this).forPath(latchPath);
- }
- }
-
-
- @Override
- public void acquireMastership(long dpid, MastershipCallback cb) throws Exception {
-
- if (mastershipId == null){
- throw new RuntimeException("Must set mastershipId before calling aquireMastership");
- }
-
- String dpidStr = HexString.toHexString(dpid);
- String latchPath = switchLatchesPath + "/" + dpidStr;
-
- if (switchLatches.get(dpidStr) != null){
- throw new RuntimeException("Leader election for switch " + dpidStr +
- "is already running");
- }
-
- LeaderLatch latch = new LeaderLatch(client, latchPath, mastershipId);
- switchLatches.put(dpidStr, latch);
- switchCallbacks.put(dpidStr, cb);
-
- try {
- //client.getChildren().usingWatcher(watcher).inBackground().forPath(singleLatchPath);
- client.getChildren().usingWatcher(
- new ParamaterizedCuratorWatcher(dpidStr, latchPath))
- .inBackground().forPath(latchPath);
- latch.start();
- } catch (Exception e) {
- log.warn("Error starting leader latch: {}", e.getMessage());
- throw e;
- }
-
- }
-
- @Override
- public void releaseMastership(long dpid) {
- String dpidStr = HexString.toHexString(dpid);
-
- LeaderLatch latch = switchLatches.get(dpidStr);
- if (latch == null) {
- log.debug("Trying to release mastership for switch we are not contesting");
- return;
- }
-
- try {
- latch.close();
- } catch (IOException e) {
- //I think it's OK not to do anything here. Either the node got deleted correctly,
- //or the connection went down and the node got deleted.
- } finally {
- switchLatches.remove(dpidStr);
- switchCallbacks.remove(dpidStr);
- }
- }
-
- @Override
- public boolean amMaster(long dpid) {
- LeaderLatch latch = switchLatches.get(HexString.toHexString(dpid));
-
- if (latch == null) {
- log.warn("No leader latch for dpid {}", HexString.toHexString(dpid));
- return false;
- }
-
- try {
- return latch.getLeader().getId().equals(mastershipId);
- } catch (Exception e) {
- //TODO swallow exception?
- return false;
- }
- }
-
- @Override
- public void setMastershipId(String id) {
- mastershipId = id;
- }
-
- @Override
- public String getMastershipId() {
- return mastershipId;
- }
-
- @Override
- public Collection<String> getAllControllers() throws Exception {
- log.debug("Getting all controllers");
-
- List<String> controllers = new ArrayList<String>();
- for (ChildData data : controllerCache.getCurrentData()){
-
- String d = null;
- try {
- d = new String(data.getData(), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new Exception("Error encoding string", e);
- }
-
- controllers.add(d);
- }
- return controllers;
- }
-
- @Override
- public void registerController(String id) throws Exception {
- byte bytes[] = null;
- try {
- bytes = id.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e1) {
- throw new Exception("Error encoding string", e1);
- }
-
- String path = controllerPath + "/" + id;
-
- log.info("Registering controller with id {}", id);
-
- //Create ephemeral node with my id
- try {
- client.create().withProtection().withMode(CreateMode.EPHEMERAL)
- .forPath(path, bytes);
- } catch (Exception e) {
- throw new Exception("Error contacting the Zookeeper service", e);
- }
- }
-
- @Override
- public String getControllerForSwitch(long dpid) throws Exception {
- // TODO Work out how we should store this controller/switch data.
- // The leader latch might be a index to the /controllers collections
- // which holds more info on the controller (how to talk to it for example).
-
-
- String strDpid = HexString.toHexString(dpid);
- LeaderLatch latch = switchLatches.get(strDpid);
-
- if (latch == null){
- log.warn("Tried to get controller for non-existent switch");
- return null;
- }
-
- Participant leader = null;
- try {
- leader = latch.getLeader();
- } catch (Exception e) {
- throw new Exception("Error contacting the Zookeeper service", e);
- }
-
- return leader.getId();
- }
-
- @Override
- public Collection<Long> getSwitchesControlledByController(String controllerId) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * IFloodlightModule
- */
-
- @Override
- public Collection<Class<? extends IFloodlightService>> getModuleServices() {
- Collection<Class<? extends IFloodlightService>> l =
- new ArrayList<Class<? extends IFloodlightService>>();
- l.add(IMastershipService.class);
- return l;
- }
-
- @Override
- public Map<Class<? extends IFloodlightService>, IFloodlightService> getServiceImpls() {
- Map<Class<? extends IFloodlightService>, IFloodlightService> m =
- new HashMap<Class<? extends IFloodlightService>, IFloodlightService>();
- m.put(IMastershipService.class, this);
- return m;
- }
-
- @Override
- public Collection<Class<? extends IFloodlightService>> getModuleDependencies() {
- // no module dependencies
- return null;
- }
-
- @Override
- public void init (FloodlightModuleContext context) throws FloodlightModuleException {
- /*
- try {
- String localHostname = java.net.InetAddress.getLocalHost().getHostName();
- mastershipId = localHostname;
- log.debug("Setting mastership id to {}", mastershipId);
- } catch (UnknownHostException e) {
- // TODO Handle this exception
- e.printStackTrace();
- }
-
- switchLatches = new HashMap<String, LeaderLatch>();
- switchCallbacks = new HashMap<String, MastershipCallback>();
-
- RetryPolicy retryPolicy = new ExponentialBackoffRetry(1000, 3);
- client = CuratorFrameworkFactory.newClient(connectionString, retryPolicy);
-
- client.start();
-
- client = client.usingNamespace(namespace);
-
- controllerCache = new PathChildrenCache(client, controllerPath, true);
-
- try {
- controllerCache.start(StartMode.BUILD_INITIAL_CACHE);
-
-
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- */
- }
-
- @Override
- public void startUp (FloodlightModuleContext context) {
- // Nothing to be done on startup
- }
-}
diff --git a/src/main/java/net/floodlightcontroller/mastership/MastershipRouteResource.java b/src/main/java/net/floodlightcontroller/mastership/MastershipRouteResource.java
deleted file mode 100644
index f75c518..0000000
--- a/src/main/java/net/floodlightcontroller/mastership/MastershipRouteResource.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.floodlightcontroller.mastership;
-
-import org.restlet.resource.ServerResource;
-import org.restlet.resource.Get;
-import org.restlet.resource.Post;
-import org.restlet.resource.Delete;
-
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
-public class MastershipRouteResource extends ServerResource {
-
- protected static Logger log = LoggerFactory.getLogger(MastershipRouteResource.class);
-
- @Get
- public String get(String fmJson) {
- // TODO
- return null;
- }
-
- @Post
- public String store (String fmJson) {
- //TODO
- return null;
- }
-
- @Delete
- public String delete (String fmJson) {
- //TODO
- return null;
- }
-}
diff --git a/src/main/java/net/floodlightcontroller/mastership/MastershipRunner.java b/src/main/java/net/floodlightcontroller/mastership/MastershipRunner.java
deleted file mode 100644
index a28a9c5..0000000
--- a/src/main/java/net/floodlightcontroller/mastership/MastershipRunner.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package net.floodlightcontroller.mastership;
-
-import net.floodlightcontroller.core.module.FloodlightModuleContext;
-import net.floodlightcontroller.core.module.FloodlightModuleException;
-import net.floodlightcontroller.mastership.IMastershipService.MastershipCallback;
-
-import org.openflow.util.HexString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Used for lightweight testing of the mastership module without having
- * to load up the entire ONOS.
- * @author jono
- *
- */
-public class MastershipRunner {
- protected static Logger log = LoggerFactory.getLogger(MastershipRunner.class);
-
- public static void main(String args[]){
- FloodlightModuleContext fmc = new FloodlightModuleContext();
- MastershipManager mm = new MastershipManager();
-
- String id = null;
- if (args.length > 0){
- id = args[0];
- log.info("Using unique id: {}", id);
- }
-
- try {
- mm.init(fmc);
- mm.startUp(fmc);
-
- if (id != null){
- mm.setMastershipId(id);
- }
-
- mm.acquireMastership(1L,
- new MastershipCallback(){
- @Override
- public void changeCallback(long dpid, boolean isMaster) {
- if (isMaster){
- log.debug("Callback for becoming master for {}", HexString.toHexString(dpid));
- }
- else {
- log.debug("Callback for losing mastership for {}", HexString.toHexString(dpid));
- }
- }
- });
-
- mm.registerController(id);
-
- Thread.sleep(5000);
-
- //"Server" loop
- while (true) {
- Thread.sleep(60000);
- }
-
- } catch (FloodlightModuleException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- log.debug("is master: {}", mm.amMaster(1L));
- }
-}
diff --git a/src/main/java/net/floodlightcontroller/mastership/MastershipWebRoutable.java b/src/main/java/net/floodlightcontroller/mastership/MastershipWebRoutable.java
deleted file mode 100644
index 56d5d66..0000000
--- a/src/main/java/net/floodlightcontroller/mastership/MastershipWebRoutable.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package net.floodlightcontroller.mastership;
-
-import org.restlet.Context;
-import org.restlet.Restlet;
-import org.restlet.routing.Router;
-
-import net.floodlightcontroller.restserver.RestletRoutable;
-
-public class MastershipWebRoutable implements RestletRoutable {
-
- @Override
- public Restlet getRestlet(Context context) {
- Router router = new Router(context);
- router.attach("/json", MastershipRouteResource.class);
- return router;
- }
-
- @Override
- public String basePath() {
- return "/wm/mastership";
- }
-
-}
diff --git a/src/main/java/net/floodlightcontroller/mastership/RegistryException.java b/src/main/java/net/floodlightcontroller/mastership/RegistryException.java
deleted file mode 100644
index 134117c..0000000
--- a/src/main/java/net/floodlightcontroller/mastership/RegistryException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.floodlightcontroller.mastership;
-
-public class RegistryException extends Exception {
-
- private static final long serialVersionUID = -8276300722010217913L;
-
- /*
- public RegistryException() {
- // TODO Auto-generated constructor stub
- }
-
- public RegistryException(String message) {
- super(message);
- // TODO Auto-generated constructor stub
- }
-
- public RegistryException(Throwable cause) {
- super(cause);
- // TODO Auto-generated constructor stub
- }
-
- public RegistryException(String message, Throwable cause) {
- super(message, cause);
- // TODO Auto-generated constructor stub
- }
-
- public RegistryException(String message, Throwable cause,
- boolean enableSuppression, boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- // TODO Auto-generated constructor stub
- }
- */
-
-}