| commit | 0872a1743c9563951722596b0fd24f7a921f9e5b | [log] [tgz] |
|---|---|---|
| author | tom <tom@onlab.us> | Tue Sep 23 11:24:26 2014 -0700 |
| committer | tom <tom@onlab.us> | Tue Sep 23 11:24:26 2014 -0700 |
| tree | 6e221b6499b577d6776d64d723cb1662ca792023 | |
| parent | ac60c089d24472f2b0fadfb2e7b94cc6e3b80a16 [diff] |
Fixed a number of CLI commands. Refactored the StoreService/Manager stuff for common serializer pool.
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 6a9b60e..8da4aa5 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
@@ -37,6 +37,9 @@ */ MastershipRole requestRoleFor(DeviceId deviceId); + // TODO: add facet for requesting a different master than the current one; + // abandon mastership (due to loss of connection) + /** * Adds the specified mastership change listener. *
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java index 23856ab..fbfec31 100644 --- a/core/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java +++ b/core/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java
@@ -15,7 +15,7 @@ * @param role requested role * @deprecated Will be removed in favor of MastershipAdminService.setRole() */ - @Deprecated +// @Deprecated void setRole(DeviceId deviceId, MastershipRole role); /**