commit 53b208a2817a3d06d4bd6bfe3d52de8bd7dfb105
author Pavlin Radoslavov <pavlin@onlab.us> Mon Jul 28 13:16:11 2014 -0700
committer Gerrit Code Review <gerrit2@localhost> Tue Jul 29 19:14:34 2014 -0700
tree e1772d23c3337b509fbd9ef32ec0ffcb9f821acd
parent 5f1ce1ccdcbcf404bb60410820e24dcea5f53a9c

Work toward ONOS-1451: Separate Event Key space per instance

Misc changes and cleanup:
* Added new class OnosInstanceId
* Replace (as appropriate) the string controllerId (and associated methods)
  with the new class OnosInstanceId
* Renaming: Host -> Device
  - Method getDeviceID -> getHostID
  - Changed Host Key ID prefix 'D' to 'H'
  - Few renaming of Host -> Device inside Javadoc

Change-Id: I59c20d68277ecde2f7df4e7097a4a52d5786df1b

src/main/java/net/onrc/onos/core/registry/StandaloneRegistry.java

diff --git a/src/main/java/net/onrc/onos/core/registry/StandaloneRegistry.java b/src/main/java/net/onrc/onos/core/registry/StandaloneRegistry.java
index 0b552f1..bec8bb4 100644
--- a/src/main/java/net/onrc/onos/core/registry/StandaloneRegistry.java
+++ b/src/main/java/net/onrc/onos/core/registry/StandaloneRegistry.java
@@ -15,6 +15,7 @@
 import net.floodlightcontroller.core.module.IFloodlightService;
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.onrc.onos.core.registry.web.RegistryWebRoutable;
+import net.onrc.onos.core.util.OnosInstanceId;
 
 import org.apache.commons.lang.NotImplementedException;
 import org.openflow.util.HexString;
@@ -32,7 +33,7 @@
 
     private IRestApiService restApi;
 
-    private String registeredControllerId;
+    private OnosInstanceId onosInstanceId;
     private Map<String, ControlChangeCallback> switchCallbacks;
 
     private long blockTop;
@@ -46,7 +47,7 @@
     @Override
     public void requestControl(long dpid, ControlChangeCallback cb)
             throws RegistryException {
-        if (registeredControllerId == null) {
+        if (onosInstanceId == null) {
             throw new IllegalStateException(
                     "Must register a controller before calling requestControl");
         }
@@ -83,32 +84,32 @@
     }
 
     @Override
-    public String getControllerId() {
-        return registeredControllerId;
+    public OnosInstanceId getOnosInstanceId() {
+        return onosInstanceId;
     }
 
     @Override
     public void registerController(String controllerId)
             throws RegistryException {
-        if (registeredControllerId != null) {
+        if (onosInstanceId != null) {
             throw new RegistryException(
-                    "Controller already registered with id " + registeredControllerId);
+                    "Controller already registered with id " + onosInstanceId);
         }
-        registeredControllerId = controllerId;
+        onosInstanceId = new OnosInstanceId(controllerId);
     }
 
     @Override
     public Collection<String> getAllControllers() throws RegistryException {
-        //List<String> l = new ArrayList<String>();
-        //l.add(registeredControllerId);
-        //return l;
-        return Collections.singletonList(registeredControllerId);
+        if (onosInstanceId == null) {
+            return new ArrayList<String>();
+        }
+        return Collections.singletonList(onosInstanceId.toString());
     }
 
     @Override
     public String getControllerForSwitch(long dpid) throws RegistryException {
         return (switchCallbacks.get(HexString.toHexString(dpid)) == null)
-                ? null : registeredControllerId;
+            ? null : onosInstanceId.toString();
     }
 
     @Override
@@ -120,7 +121,7 @@
             log.debug("Switch _{}", strSwitch);
             List<ControllerRegistryEntry> list =
                     new ArrayList<ControllerRegistryEntry>();
-            list.add(new ControllerRegistryEntry(registeredControllerId, 0));
+            list.add(new ControllerRegistryEntry(onosInstanceId.toString(), 0));
 
             switches.put(strSwitch, list);
         }