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/ZookeeperRegistry.java

diff --git a/src/main/java/net/onrc/onos/core/registry/ZookeeperRegistry.java b/src/main/java/net/onrc/onos/core/registry/ZookeeperRegistry.java
index ce68ec2..fb7b573 100644
--- a/src/main/java/net/onrc/onos/core/registry/ZookeeperRegistry.java
+++ b/src/main/java/net/onrc/onos/core/registry/ZookeeperRegistry.java
@@ -22,6 +22,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.apache.curator.RetryPolicy;
@@ -60,7 +61,7 @@
 
     private static final Logger log = LoggerFactory.getLogger(ZookeeperRegistry.class);
 
-    private String controllerId;
+    private OnosInstanceId onosInstanceId;
 
     private IRestApiService restApi;
 
@@ -255,7 +256,7 @@
             throws RegistryException {
         log.info("Requesting control for {}", HexString.toHexString(dpid));
 
-        if (controllerId == null) {
+        if (onosInstanceId == null) {
             throw new IllegalStateException("Must register a controller before"
                     + " calling requestControl");
         }
@@ -270,7 +271,8 @@
         String latchPath = SWITCH_LATCHES_PATH + "/" + dpidStr;
 
         LeaderLatch latch =
-                new LeaderLatch(curatorFrameworkClient, latchPath, controllerId);
+            new LeaderLatch(curatorFrameworkClient, latchPath,
+                            onosInstanceId.toString());
         SwitchLeaderListener listener = new SwitchLeaderListener(dpidStr);
         latch.addListener(listener);
 
@@ -348,8 +350,8 @@
     }
 
     @Override
-    public String getControllerId() {
-        return controllerId;
+    public OnosInstanceId getOnosInstanceId() {
+        return onosInstanceId;
     }
 
     @Override
@@ -369,18 +371,18 @@
 
     @Override
     public void registerController(String id) throws RegistryException {
-        if (controllerId != null) {
+        if (onosInstanceId != null) {
             throw new RegistryException(
-                    "Controller already registered with id " + controllerId);
+                    "Controller already registered with id " + onosInstanceId);
         }
 
-        controllerId = id;
+        onosInstanceId = new OnosInstanceId(id);
 
         try {
             ServiceInstance<ControllerService> thisInstance =
                     ServiceInstance.<ControllerService>builder()
                     .name(CONTROLLER_SERVICE_NAME)
-                    .payload(new ControllerService(controllerId))
+                    .payload(new ControllerService(onosInstanceId.toString()))
                     .build();
 
             serviceDiscovery.registerService(thisInstance);
@@ -646,12 +648,13 @@
         // NOTE: We have to do it here, because during the init stage
         // we don't know the Controller ID.
         //
-        if (controllerId == null) {
-            log.error("Error on startup: unknown ControllerId");
+        if (onosInstanceId == null) {
+            log.error("Error on startup: unknown ONOS Instance ID");
+            return;
         }
         clusterLeaderLatch = new LeaderLatch(curatorFrameworkClient,
                 CLUSTER_LEADER_PATH,
-                controllerId);
+                onosInstanceId.toString());
         clusterLeaderListener = new ClusterLeaderListener();
         clusterLeaderLatch.addListener(clusterLeaderListener);
         try {