commit de003d9763b64a9887cd0427c8080bab61e96ded
author Madan Jampani <madan@onlab.us> Mon May 11 17:14:20 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu May 14 23:31:27 2015 +0000
tree eeda2677f66d42975ad21f61d453b1b889882abf
parent 3cc2330018584191153d1998f57404b69b27689d

LeadershipService and MastershipService/Store APIs return CompletableFutures so that callers can (optionally) chain together dependent operations

Change-Id: Ia00fcb7d98fbfce897527f67ea9690abf6fe846a

core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java

diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java b/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java
index 6c41fb2..a8835fc 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java
@@ -15,6 +15,8 @@
  */
 package org.onosproject.mastership;
 
+import java.util.concurrent.CompletableFuture;
+
 import org.onosproject.cluster.NodeId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.MastershipRole;
@@ -30,8 +32,9 @@
      * @param instance controller instance identifier
      * @param deviceId device identifier
      * @param role     requested role
+     * @return future that is completed when the role is set
      */
-    void setRole(NodeId instance, DeviceId deviceId, MastershipRole role);
+    CompletableFuture<Void> setRole(NodeId instance, DeviceId deviceId, MastershipRole role);
 
     /**
      * Balances the mastership to be shared as evenly as possibly by all

core/api/src/main/java/org/onosproject/mastership/MastershipService.java

diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipService.java b/core/api/src/main/java/org/onosproject/mastership/MastershipService.java
index f03f6c8..450bcc5 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipService.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipService.java
@@ -16,6 +16,7 @@
 package org.onosproject.mastership;
 
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.RoleInfo;
@@ -46,7 +47,7 @@
      * @param deviceId the the identifier of the device
      * @return the role of this controller instance
      */
-    MastershipRole requestRoleFor(DeviceId deviceId);
+    CompletableFuture<MastershipRole> requestRoleFor(DeviceId deviceId);
 
     /**
      * Abandons mastership of the specified device on the local node thus

core/api/src/main/java/org/onosproject/mastership/MastershipStore.java

diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java b/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java
index 6b64705..81c2d8b 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java
@@ -38,7 +38,7 @@
      * @param deviceId device identifier
      * @return established or newly negotiated mastership role
      */
-    MastershipRole requestRole(DeviceId deviceId);
+    CompletableFuture<MastershipRole> requestRole(DeviceId deviceId);
 
     /**
      * Returns the role of a device for a specific controller instance.