Implemented the API method to get all switch-controller information from Zookeeper. Also implemented the informational REST APIs for the Registry service
diff --git a/src/main/java/net/onrc/onos/registry/controller/IControllerRegistryService.java b/src/main/java/net/onrc/onos/registry/controller/IControllerRegistryService.java
index f2794cc..e924f6a 100644
--- a/src/main/java/net/onrc/onos/registry/controller/IControllerRegistryService.java
+++ b/src/main/java/net/onrc/onos/registry/controller/IControllerRegistryService.java
@@ -1,6 +1,7 @@
package net.onrc.onos.registry.controller;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
import net.floodlightcontroller.core.module.IFloodlightService;
@@ -14,7 +15,7 @@
}
// Acquire mastership for a switch.
- public void requestControl(long dpid, ControlChangeCallback cb) throws Exception;
+ public void requestControl(long dpid, ControlChangeCallback cb) throws RegistryException;
// Release mastership for a switch
public void releaseControl(long dpid);
@@ -42,7 +43,7 @@
public String getControllerForSwitch(long dpid) throws RegistryException;
- public Collection<Map<String, String>> getAllSwitches();
+ public Map<String, List<ControllerRegistryEntry>> getAllSwitches();
public Collection<Long> getSwitchesControlledByController(String controllerId);
}