role reassignment tweaks
Change-Id: Ie6d412787330e67a13e605a34f0824cf70882f85
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/MastershipService.java b/core/api/src/main/java/org/onlab/onos/cluster/MastershipService.java
index d417516..ffee162 100644
--- a/core/api/src/main/java/org/onlab/onos/cluster/MastershipService.java
+++ b/core/api/src/main/java/org/onlab/onos/cluster/MastershipService.java
@@ -33,7 +33,7 @@
/**
* Abandons mastership of the specified device on the local node thus
* forcing selection of a new master. If the local node is not a master
- * for this device, no action will be taken.
+ * for this device, no master selection will occur.
*
* @param deviceId the identifier of the device
*/
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java b/core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java
index bedc5e9..dc5603f 100644
--- a/core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java
+++ b/core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java
@@ -66,12 +66,25 @@
MastershipTerm getTermFor(DeviceId deviceId);
/**
- * Revokes a controller instance's mastership over a device and hands
- * over mastership to another controller instance.
+ * Sets a controller instance's mastership role to STANDBY for a device.
+ * If the role is MASTER, another controller instance will be selected
+ * as a candidate master.
*
* @param nodeId the controller instance identifier
- * @param deviceId device to revoke mastership for
+ * @param deviceId device to revoke mastership role for
* @return a mastership event
*/
- MastershipEvent unsetMaster(NodeId nodeId, DeviceId deviceId);
+ MastershipEvent setStandby(NodeId nodeId, DeviceId deviceId);
+
+ /**
+ * Allows a controller instance to give up its current role for a device.
+ * If the role is MASTER, another controller instance will be selected
+ * as a candidate master.
+ *
+ * @param nodeId the controller instance identifier
+ * @param deviceId device to revoke mastership role for
+ * @return a mastership event
+ */
+ MastershipEvent relinquishRole(NodeId nodeId, DeviceId deviceId);
+
}