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=5591772afcdeafba3cb6f1989bd06610f537e9cc;hp=c2d997f7029b922a6f5247ec045ceee45b605b38;hb=689370fdbfdd18d6bd25359b94b1a8f6d76aba1c;hpb=a507f19b518f36065c74f4f88c9327ede28ff640 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 c2d997f702..5591772afc 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 @@ -13,15 +13,20 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_ID_QNAME; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_OWNERS_PATH; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_QNAME; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.entityEntryWithOwner; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.entityOwnersWithEntityTypeEntry; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.entityPath; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.entityTypeEntryWithEntityEntry; import akka.actor.ActorRef; import akka.actor.PoisonPill; import akka.actor.Props; +import com.google.common.base.Function; import com.google.common.base.Optional; -import com.google.common.base.Stopwatch; -import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Uninterruptibles; import java.util.Collections; -import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -31,22 +36,30 @@ import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.DatastoreContext; 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.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.identifiers.ShardIdentifier; -import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy; -import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; +import org.opendaylight.controller.cluster.datastore.messages.GetShardDataTree; import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper; -import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; import org.opendaylight.controller.md.sal.common.api.clustering.CandidateAlreadyRegisteredException; import org.opendaylight.controller.md.sal.common.api.clustering.Entity; -import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidate; import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidateRegistration; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; +import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListener; +import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListenerRegistration; +import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState; 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.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import scala.concurrent.Await; import scala.concurrent.Future; @@ -71,30 +84,16 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh DatastoreContext datastoreContext = DatastoreContext.newBuilder().dataStoreType(dataStoreType). shardInitializationTimeout(10, TimeUnit.SECONDS).build(); - // FIXME - remove this MockConfiguration and use the production ConfigurationImpl class when the - // DistributedEntityOwnershipService is changed to setup the ShardStrategy for the entity-owners module. - MockConfiguration configuration = new MockConfiguration(Collections.>emptyMap()) { + Configuration configuration = new ConfigurationImpl(new ModuleShardConfigProvider() { @Override - public Optional getModuleNameFromNameSpace(String nameSpace) { - return Optional.of("entity-owners"); + public Map retrieveModuleConfigs(Configuration configuration) { + return Collections.emptyMap(); } - - @Override - public Map getModuleNameToShardStrategyMap() { - return ImmutableMap.builder().put("entity-owners", new ShardStrategy() { - @Override - public String findShard(YangInstanceIdentifier path) { - return DistributedEntityOwnershipService.ENTITY_OWNERSHIP_SHARD_NAME; - } - }).build(); - } - }; + }); dataStore = new DistributedDataStore(getSystem(), new MockClusterWrapper(), configuration, datastoreContext ); dataStore.onGlobalContextUpdated(SchemaContextHelper.entityOwners()); - - ShardStrategyFactory.setConfiguration(configuration); } @After @@ -131,24 +130,21 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh YangInstanceIdentifier entityId = YangInstanceIdentifier.of(QNAME); Entity entity = new Entity(ENTITY_TYPE, entityId); - EntityOwnershipCandidate candidate = mock(EntityOwnershipCandidate.class); - EntityOwnershipCandidateRegistration reg = service.registerCandidate(entity, candidate); + EntityOwnershipCandidateRegistration reg = service.registerCandidate(entity); verifyEntityOwnershipCandidateRegistration(entity, reg); - verifyRegisterCandidateLocal(shardPropsCreator, entity, candidate); - verifyEntityCandidate(readEntityOwners(service.getLocalEntityOwnershipShard()), ENTITY_TYPE, entityId, + verifyRegisterCandidateLocal(shardPropsCreator, entity); + verifyEntityCandidate(service.getLocalEntityOwnershipShard(), ENTITY_TYPE, entityId, dataStore.getActorContext().getCurrentMemberName()); // Register the same entity - should throw exception - EntityOwnershipCandidate candidate2 = mock(EntityOwnershipCandidate.class); try { - service.registerCandidate(entity, candidate2); + service.registerCandidate(entity); fail("Expected CandidateAlreadyRegisteredException"); } catch(CandidateAlreadyRegisteredException e) { // expected - assertSame("getCandidate", candidate, e.getRegisteredCandidate()); assertEquals("getEntity", entity, e.getEntity()); } @@ -157,11 +153,11 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh Entity entity2 = new Entity(ENTITY_TYPE2, entityId); shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class); - EntityOwnershipCandidateRegistration reg2 = service.registerCandidate(entity2, candidate); + EntityOwnershipCandidateRegistration reg2 = service.registerCandidate(entity2); verifyEntityOwnershipCandidateRegistration(entity2, reg2); - verifyRegisterCandidateLocal(shardPropsCreator, entity2, candidate); - verifyEntityCandidate(readEntityOwners(service.getLocalEntityOwnershipShard()), ENTITY_TYPE2, entityId, + verifyRegisterCandidateLocal(shardPropsCreator, entity2); + verifyEntityCandidate(service.getLocalEntityOwnershipShard(), ENTITY_TYPE2, entityId, dataStore.getActorContext().getCurrentMemberName()); service.close(); @@ -182,12 +178,11 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class); Entity entity = new Entity(ENTITY_TYPE, YangInstanceIdentifier.of(QNAME)); - EntityOwnershipCandidate candidate = mock(EntityOwnershipCandidate.class); - EntityOwnershipCandidateRegistration reg = service.registerCandidate(entity, candidate); + EntityOwnershipCandidateRegistration reg = service.registerCandidate(entity); verifyEntityOwnershipCandidateRegistration(entity, reg); - verifyRegisterCandidateLocal(shardPropsCreator, entity, candidate); + verifyRegisterCandidateLocal(shardPropsCreator, entity); shardPropsCreator.expectShardMessage(UnregisterCandidateLocal.class); @@ -200,43 +195,122 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class); - service.registerCandidate(entity, candidate); + service.registerCandidate(entity); - verifyRegisterCandidateLocal(shardPropsCreator, entity, candidate); + verifyRegisterCandidateLocal(shardPropsCreator, entity); service.close(); } @Test - public void testRegisterListener() { + public void testListenerRegistration() { + final TestShardPropsCreator shardPropsCreator = new TestShardPropsCreator(); + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) { + @Override + protected EntityOwnershipShardPropsCreator newShardPropsCreator() { + return shardPropsCreator; + } + }; + + service.start(); + + shardPropsCreator.expectShardMessage(RegisterListenerLocal.class); + + YangInstanceIdentifier entityId = YangInstanceIdentifier.of(QNAME); + Entity entity = new Entity(ENTITY_TYPE, entityId); + EntityOwnershipListener listener = mock(EntityOwnershipListener.class); + + EntityOwnershipListenerRegistration reg = service.registerListener(entity.getType(), listener); + + assertNotNull("EntityOwnershipListenerRegistration null", reg); + assertEquals("getEntityType", entity.getType(), reg.getEntityType()); + assertEquals("getInstance", listener, reg.getInstance()); + + RegisterListenerLocal regListener = shardPropsCreator.waitForShardMessage(); + assertSame("getListener", listener, regListener.getListener()); + assertEquals("getEntityType", entity.getType(), regListener.getEntityType()); + + shardPropsCreator.expectShardMessage(UnregisterListenerLocal.class); + + reg.close(); + + UnregisterListenerLocal unregListener = shardPropsCreator.waitForShardMessage(); + assertEquals("getEntityType", entity.getType(), unregListener.getEntityType()); + assertSame("getListener", listener, unregListener.getListener()); + + service.close(); } - private NormalizedNode readEntityOwners(ActorRef shard) throws Exception { - Stopwatch sw = Stopwatch.createStarted(); - while(sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) { - DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); - Optional> optional = readTx.read(EntityOwnershipShard.ENTITY_OWNERS_PATH). - checkedGet(5, TimeUnit.SECONDS); - if(optional.isPresent()) { - return optional.get(); + @Test + public void testGetOwnershipState() throws Exception { + final TestShardPropsCreator shardPropsCreator = new TestShardPropsCreator(); + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) { + @Override + protected EntityOwnershipShardPropsCreator newShardPropsCreator() { + return shardPropsCreator; } + }; - Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS); - } + service.start(); + + ShardDataTree shardDataTree = new ShardDataTree(SchemaContextHelper.entityOwners()); + shardPropsCreator.setDataTree(shardDataTree.getDataTree()); + + Entity entity1 = new Entity(ENTITY_TYPE, "one"); + writeNode(ENTITY_OWNERS_PATH, entityOwnersWithEntityTypeEntry(entityTypeEntryWithEntityEntry(entity1.getType(), + entityEntryWithOwner(entity1.getId(), "member-1"))), shardDataTree); + verifyGetOwnershipState(service, entity1, true, true); + + writeNode(entityPath(entity1.getType(), entity1.getId()), entityEntryWithOwner(entity1.getId(), "member-2"), + shardDataTree); + verifyGetOwnershipState(service, entity1, false, true); - return null; + writeNode(entityPath(entity1.getType(), entity1.getId()), entityEntryWithOwner(entity1.getId(), ""), + shardDataTree); + verifyGetOwnershipState(service, entity1, false, false); + + Entity entity2 = new Entity(ENTITY_TYPE, "two"); + Optional state = service.getOwnershipState(entity2); + assertEquals("getOwnershipState present", false, state.isPresent()); + + writeNode(entityPath(entity2.getType(), entity2.getId()), ImmutableNodes.mapEntry(ENTITY_QNAME, + ENTITY_ID_QNAME, entity2.getId()), shardDataTree); + verifyGetOwnershipState(service, entity2, false, false); + + service.close(); } - private void verifyRegisterCandidateLocal(final TestShardPropsCreator shardPropsCreator, Entity entity, - EntityOwnershipCandidate candidate) { + private void verifyGetOwnershipState(DistributedEntityOwnershipService service, Entity entity, + boolean isOwner, boolean hasOwner) { + Optional state = service.getOwnershipState(entity); + assertEquals("getOwnershipState present", true, state.isPresent()); + assertEquals("isOwner", isOwner, state.get().isOwner()); + assertEquals("hasOwner", hasOwner, state.get().hasOwner()); + } + + private void verifyEntityCandidate(ActorRef entityOwnershipShard, String entityType, + YangInstanceIdentifier entityId, String candidateName) { + verifyEntityCandidate(entityType, entityId, candidateName, + new Function>() { + @Override + public NormalizedNode apply(YangInstanceIdentifier path) { + try { + return dataStore.newReadOnlyTransaction().read(path).get(5, TimeUnit.SECONDS).get(); + } catch (Exception e) { + return null; + } + } + }); + } + + private void verifyRegisterCandidateLocal(final TestShardPropsCreator shardPropsCreator, Entity entity) { RegisterCandidateLocal regCandidate = shardPropsCreator.waitForShardMessage(); - assertSame("getCandidate", candidate, regCandidate.getCandidate()); assertEquals("getEntity", entity, regCandidate.getEntity()); } private void verifyEntityOwnershipCandidateRegistration(Entity entity, EntityOwnershipCandidateRegistration reg) { assertNotNull("EntityOwnershipCandidateRegistration null", reg); - assertEquals("getEntity", entity, reg.getEntity()); + assertEquals("getInstance", entity, reg.getInstance()); } static class TestShardPropsCreator extends EntityOwnershipShardPropsCreator { @@ -247,12 +321,13 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh private final AtomicReference messageReceived = new AtomicReference<>(); private final AtomicReference receivedMessage = new AtomicReference<>(); private final AtomicReference> messageClass = new AtomicReference<>(); + private final AtomicReference dataTree = new AtomicReference<>(); @Override public Props newProps(ShardIdentifier shardId, Map peerAddresses, DatastoreContext datastoreContext, SchemaContext schemaContext) { return Props.create(TestEntityOwnershipShard.class, shardId, peerAddresses, datastoreContext, - schemaContext, "member-1", messageClass, messageReceived, receivedMessage); + schemaContext, "member-1", messageClass, messageReceived, receivedMessage, dataTree); } @SuppressWarnings("unchecked") @@ -268,27 +343,37 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh receivedMessage.set(null); messageClass.set(ofType); } + + void setDataTree(DataTree tree) { + this.dataTree.set(tree); + } } static class TestEntityOwnershipShard extends EntityOwnershipShard { private final AtomicReference messageReceived; private final AtomicReference receivedMessage; private final AtomicReference> messageClass; + private final AtomicReference dataTree; protected TestEntityOwnershipShard(ShardIdentifier name, Map peerAddresses, DatastoreContext datastoreContext, SchemaContext schemaContext, String localMemberName, AtomicReference> messageClass, AtomicReference messageReceived, - AtomicReference receivedMessage) { + AtomicReference receivedMessage, AtomicReference dataTree) { super(name, peerAddresses, datastoreContext, schemaContext, localMemberName); this.messageClass = messageClass; this.messageReceived = messageReceived; this.receivedMessage = receivedMessage; + this.dataTree = dataTree; } @Override public void onReceiveCommand(final Object message) throws Exception { try { - super.onReceiveCommand(message); + if(dataTree.get() != null && message instanceof GetShardDataTree) { + sender().tell(dataTree.get(), self()); + } else { + super.onReceiveCommand(message); + } } finally { Class expMsgClass = messageClass.get(); if(expMsgClass != null && expMsgClass.equals(message.getClass())) {