| commit | 39b3b1979952620a99f418be67ecbe240a16bb6e | [log] [tgz] |
|---|---|---|
| author | Madan Jampani <madan@onlab.us> | Thu May 19 08:08:29 2016 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Thu May 19 16:23:43 2016 +0000 |
| tree | ad53052674503e60f5c227a353bb7141ff72c1b5 | |
| parent | 3a84b32b1fcf58100a7c6d0451a3302f8ebe550e [diff] |
Deprecate MastershipService::getDevicesOf method Change-Id: I79ac1cbd7765229d39a5e2c614c98f17760f52a1
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 9f9257d..1d16a44 100644 --- a/core/api/src/main/java/org/onosproject/mastership/MastershipService.java +++ b/core/api/src/main/java/org/onosproject/mastership/MastershipService.java
@@ -124,7 +124,9 @@ * * @param nodeId the ID of the controller * @return a set of device IDs + * @deprecated 1.6.0 Goldeneye release. */ + @Deprecated Set<DeviceId> getDevicesOf(NodeId nodeId); }
diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java index 4790ece..57ee153 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java +++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
@@ -843,8 +843,9 @@ } try { // determine the set of devices that we need to backup during this run. - Set<DeviceId> devicesToBackup = mastershipService.getDevicesOf(local) + Set<DeviceId> devicesToBackup = flowEntries.keySet() .stream() + .filter(mastershipService::isLocalMaster) .filter(deviceId -> { Long lastBackupTime = lastBackupTimes.get(deviceId); Long lastUpdateTime = lastUpdateTimes.get(deviceId);