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/topology/MastershipEvent.java

diff --git a/src/main/java/net/onrc/onos/core/topology/MastershipEvent.java b/src/main/java/net/onrc/onos/core/topology/MastershipEvent.java
index 5ed36a3..5668e2f 100644
--- a/src/main/java/net/onrc/onos/core/topology/MastershipEvent.java
+++ b/src/main/java/net/onrc/onos/core/topology/MastershipEvent.java
@@ -7,6 +7,7 @@
 import net.floodlightcontroller.core.IFloodlightProviderService.Role;
 import net.onrc.onos.core.topology.web.serializers.MastershipEventSerializer;
 import net.onrc.onos.core.util.Dpid;
+import net.onrc.onos.core.util.OnosInstanceId;
 
 import org.apache.commons.lang.Validate;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
@@ -22,7 +23,7 @@
 public class MastershipEvent extends TopologyElement<MastershipEvent> {
 
     private final Dpid dpid;
-    private final String onosInstanceId;
+    private final OnosInstanceId onosInstanceId;
     private final Role role;
 
     /**
@@ -42,7 +43,8 @@
      * @param onosInstanceId the ONOS Instance ID
      * @param role the ONOS instance role for the switch.
      */
-    public MastershipEvent(Dpid dpid, String onosInstanceId, Role role) {
+    public MastershipEvent(Dpid dpid, OnosInstanceId onosInstanceId,
+                           Role role) {
         Validate.notNull(dpid);
         Validate.notNull(onosInstanceId);
 
@@ -77,7 +79,7 @@
      *
      * @return the ONOS Instance ID.
      */
-    public String getOnosInstanceId() {
+    public OnosInstanceId getOnosInstanceId() {
         return onosInstanceId;
     }