commit 406d010846e083e05f509bd6645dda481b041436
author Ayaka Koshibe <ayaka@onlab.us> Wed Sep 24 16:08:12 2014 -0700
committer Ayaka Koshibe <ayaka@onlab.us> Wed Sep 24 16:08:12 2014 -0700
tree 2aed38d27df6b26053973da47fbb8aef7ff6a3ba
parent f6021f304423be0eb0a3630e0be424bee3a5f6cc

MastershipManagerTest plus tweaks to MastershipStore

Change-Id: Ie5d3201ce2297ae68cdafac4439168989dd804c5

core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java

diff --git a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
index 4ac6052..255830c 100644
--- a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
@@ -64,9 +64,12 @@
         checkNotNull(nodeId, NODE_ID_NULL);
         checkNotNull(deviceId, DEVICE_ID_NULL);
         checkNotNull(role, ROLE_NULL);
-        MastershipEvent event = store.setRole(nodeId, deviceId, role);
-        if (event != null) {
-            post(event);
+        //TODO figure out appropriate action for non-MASTER roles, if we even set those
+        if (role.equals(MastershipRole.MASTER)) {
+            MastershipEvent event = store.setMaster(nodeId, deviceId);
+            if (event != null) {
+                post(event);
+            }
         }
     }