X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fentityownership%2FDistributedEntityOwnershipServiceTest.java;h=63e576944b985b0d8272fd533cd8a02be95b5650;hp=d38959d7dbebda1bff468be4243afd3083277c99;hb=88f763ec4ec2bcc1e0fd414ccb2f105f7490b8e9;hpb=e970feb618c5e3793454f7f1a3974797a61c7c17 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java index d38959d7db..63e576944b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.cluster.datastore.entityownership; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -25,9 +26,9 @@ import akka.actor.PoisonPill; import akka.actor.Props; import com.google.common.base.Function; import com.google.common.base.Optional; +import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; -import java.util.Collections; -import java.util.Map; +import java.util.Collection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -41,12 +42,12 @@ import org.opendaylight.controller.cluster.datastore.DistributedDataStore; import org.opendaylight.controller.cluster.datastore.ShardDataTree; import org.opendaylight.controller.cluster.datastore.config.Configuration; import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl; -import org.opendaylight.controller.cluster.datastore.config.ModuleConfig; -import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfigProvider; +import org.opendaylight.controller.cluster.datastore.config.EmptyModuleShardConfigProvider; import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterCandidateLocal; import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterListenerLocal; import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterCandidateLocal; import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterListenerLocal; +import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyConfig; import org.opendaylight.controller.cluster.datastore.messages.GetShardDataTree; import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; @@ -60,6 +61,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; +import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import scala.concurrent.Await; import scala.concurrent.Future; @@ -76,26 +78,26 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh static int ID_COUNTER = 1; static final QName QNAME = QName.create("test", "2015-08-11", "foo"); - private final String dataStoreType = "config" + ID_COUNTER++; + private final String dataStoreName = "config" + ID_COUNTER++; private DistributedDataStore dataStore; @Before public void setUp() { - DatastoreContext datastoreContext = DatastoreContext.newBuilder().dataStoreType(dataStoreType). + DatastoreContext datastoreContext = DatastoreContext.newBuilder().dataStoreName(dataStoreName). shardInitializationTimeout(10, TimeUnit.SECONDS).build(); - Configuration configuration = new ConfigurationImpl(new ModuleShardConfigProvider() { + Configuration configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()) { @Override - public Map retrieveModuleConfigs(Configuration configuration) { - return Collections.emptyMap(); + public Collection getUniqueMemberNamesForAllShards() { + return Sets.newHashSet("member-1"); } - }); + }; DatastoreContextFactory mockContextFactory = Mockito.mock(DatastoreContextFactory.class); Mockito.doReturn(datastoreContext).when(mockContextFactory).getBaseDatastoreContext(); Mockito.doReturn(datastoreContext).when(mockContextFactory).getShardDatastoreContext(Mockito.anyString()); - dataStore = new DistributedDataStore(getSystem(), new MockClusterWrapper(), configuration, mockContextFactory); + dataStore = new DistributedDataStore(getSystem(), new MockClusterWrapper(), configuration, mockContextFactory, null); dataStore.onGlobalContextUpdated(SchemaContextHelper.entityOwners()); } @@ -107,7 +109,8 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh @Test public void testEntityOwnershipShardCreated() throws Exception { - DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore); + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore, + EntityOwnerSelectionStrategyConfig.newBuilder().build()); service.start(); Future future = dataStore.getActorContext().findLocalShardAsync( @@ -121,7 +124,8 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh @Test public void testRegisterCandidate() throws Exception { final TestShardBuilder shardBuilder = new TestShardBuilder(); - DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) { + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore, + EntityOwnerSelectionStrategyConfig.newBuilder().build()) { @Override protected EntityOwnershipShard.Builder newShardBuilder() { return shardBuilder; @@ -170,7 +174,8 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh @Test public void testCloseCandidateRegistration() throws Exception { final TestShardBuilder shardBuilder = new TestShardBuilder(); - DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) { + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore, + EntityOwnerSelectionStrategyConfig.newBuilder().build()) { @Override protected EntityOwnershipShard.Builder newShardBuilder() { return shardBuilder; @@ -209,7 +214,8 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh @Test public void testListenerRegistration() { final TestShardBuilder shardBuilder = new TestShardBuilder(); - DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) { + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore, + EntityOwnerSelectionStrategyConfig.newBuilder().build()) { @Override protected EntityOwnershipShard.Builder newShardBuilder() { return shardBuilder; @@ -248,7 +254,8 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh @Test public void testGetOwnershipState() throws Exception { final TestShardBuilder shardBuilder = new TestShardBuilder(); - DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) { + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore, + EntityOwnerSelectionStrategyConfig.newBuilder().build()) { @Override protected EntityOwnershipShard.Builder newShardBuilder() { return shardBuilder; @@ -257,7 +264,7 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh service.start(); - ShardDataTree shardDataTree = new ShardDataTree(SchemaContextHelper.entityOwners()); + ShardDataTree shardDataTree = new ShardDataTree(SchemaContextHelper.entityOwners(), TreeType.OPERATIONAL); shardBuilder.setDataTree(shardDataTree.getDataTree()); Entity entity1 = new Entity(ENTITY_TYPE, "one"); @@ -284,6 +291,30 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh service.close(); } + @Test + public void testIsCandidateRegistered() throws CandidateAlreadyRegisteredException { + final TestShardBuilder shardBuilder = new TestShardBuilder(); + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore, + EntityOwnerSelectionStrategyConfig.newBuilder().build()) { + @Override + protected EntityOwnershipShard.Builder newShardBuilder() { + return shardBuilder; + } + }; + + service.start(); + + final Entity test = new Entity("test-type", "test"); + + assertFalse(service.isCandidateRegistered(test)); + + service.registerCandidate(test); + + assertTrue(service.isCandidateRegistered(test)); + + service.close(); + } + private static void verifyGetOwnershipState(DistributedEntityOwnershipService service, Entity entity, boolean isOwner, boolean hasOwner) { Optional state = service.getOwnershipState(entity); @@ -319,7 +350,8 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh static class TestShardBuilder extends EntityOwnershipShard.Builder { TestShardBuilder() { - localMemberName("member-1"); + localMemberName("member-1").ownerSelectionStrategyConfig( + EntityOwnerSelectionStrategyConfig.newBuilder().build()); } private final AtomicReference messageReceived = new AtomicReference<>(); @@ -329,6 +361,7 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh @Override public Props props() { + verify(); return Props.create(TestEntityOwnershipShard.class,this, messageClass, messageReceived, receivedMessage, dataTree); }