Renamed *MastershipStore* to *DeviceMastershipStore*
diff --git a/core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java b/core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStore.java
similarity index 99%
rename from core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java
rename to core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStore.java
index 97e6c1e..cdcf84b 100644
--- a/core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java
+++ b/core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStore.java
@@ -32,7 +32,7 @@
*/
@Component(immediate = true)
@Service
-public class DistributedMastershipStore
+public class DistributedDeviceMastershipStore
extends AbstractHazelcastStore<DeviceMastershipEvent, DeviceMastershipStoreDelegate>
implements DeviceMastershipStore {
diff --git a/core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStoreTest.java b/core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStoreTest.java
similarity index 95%
rename from core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStoreTest.java
rename to core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStoreTest.java
index 85ee01a..d993250 100644
--- a/core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStoreTest.java
+++ b/core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStoreTest.java
@@ -40,7 +40,7 @@
/**
* Test of the Hazelcast-based distributed MastershipStore implementation.
*/
-public class DistributedMastershipStoreTest {
+public class DistributedDeviceMastershipStoreTest {
private static final DeviceId DID1 = DeviceId.deviceId("of:01");
private static final DeviceId DID2 = DeviceId.deviceId("of:02");
@@ -54,8 +54,8 @@
private static final ControllerNode CN1 = new DefaultControllerNode(N1, IP);
private static final ControllerNode CN2 = new DefaultControllerNode(N2, IP);
- private DistributedMastershipStore dms;
- private TestDistributedMastershipStore testStore;
+ private DistributedDeviceMastershipStore dms;
+ private TestDistributedDeviceMastershipStore testStore;
private KryoSerializer serializationMgr;
private StoreManager storeMgr;
@@ -77,11 +77,11 @@
serializationMgr = new KryoSerializer();
- dms = new TestDistributedMastershipStore(storeMgr, serializationMgr);
+ dms = new TestDistributedDeviceMastershipStore(storeMgr, serializationMgr);
dms.clusterService = new TestClusterService();
dms.activate();
- testStore = (TestDistributedMastershipStore) dms;
+ testStore = (TestDistributedDeviceMastershipStore) dms;
}
@After
@@ -227,9 +227,9 @@
assertTrue("Add event fired", addLatch.await(1, TimeUnit.SECONDS));
}
- private class TestDistributedMastershipStore extends
- DistributedMastershipStore {
- public TestDistributedMastershipStore(StoreService storeService,
+ private class TestDistributedDeviceMastershipStore extends
+ DistributedDeviceMastershipStore {
+ public TestDistributedDeviceMastershipStore(StoreService storeService,
KryoSerializer kryoSerialization) {
this.storeService = storeService;
this.serializer = kryoSerialization;