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%2FIntegrationTestKit.java;h=8bb274e2e4760b9eae1d12b3f8bad5f2a3d283c6;hp=965eaf0066e16b507b447c057b8424d17d3dfa51;hb=HEAD;hpb=9bce68c4712d00951d121be68b09578bc6e09151 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java index 965eaf0066..63e9ba72a7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java @@ -9,8 +9,11 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import akka.actor.ActorRef; import akka.actor.ActorSystem; @@ -22,21 +25,17 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Uninterruptibles; -import java.lang.reflect.Constructor; import java.util.Optional; import java.util.Set; -import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import org.mockito.Mockito; +import org.opendaylight.controller.cluster.databroker.ClientBackedDataStore; import org.opendaylight.controller.cluster.datastore.DatastoreContext.Builder; import org.opendaylight.controller.cluster.datastore.config.Configuration; import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl; -import org.opendaylight.controller.cluster.datastore.config.EmptyModuleShardConfigProvider; -import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.messages.OnDemandShardState; import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot; -import org.opendaylight.controller.cluster.datastore.utils.ActorContext; +import org.opendaylight.controller.cluster.datastore.utils.ActorUtils; import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftState; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -46,12 +45,12 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain; import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.concurrent.Await; import scala.concurrent.Future; -import scala.concurrent.duration.Duration; +import scala.concurrent.duration.FiniteDuration; public class IntegrationTestKit extends ShardTestKit { @@ -76,78 +75,56 @@ public class IntegrationTestKit extends ShardTestKit { return datastoreContextBuilder; } - public DistributedDataStore setupDistributedDataStore(final String typeName, final String moduleShardsConfig, - final boolean waitUntilLeader, - final SchemaContext schemaContext) throws Exception { - return setupDistributedDataStore(typeName, moduleShardsConfig, "modules.conf", waitUntilLeader, schemaContext); + public ClientBackedDataStore setupDataStore(final Class implementation, + final String typeName, final String... shardNames) throws Exception { + return setupDataStore(implementation, typeName, "module-shards.conf", true, SchemaContextHelper.full(), + shardNames); } - public DistributedDataStore setupDistributedDataStore(final String typeName, final String moduleShardsConfig, - final String modulesConfig, - final boolean waitUntilLeader, - final SchemaContext schemaContext, - final String... shardNames) throws Exception { - return (DistributedDataStore) setupAbstractDataStore(DistributedDataStore.class, typeName, moduleShardsConfig, - modulesConfig, waitUntilLeader, schemaContext, shardNames); + public ClientBackedDataStore setupDataStore(final Class implementation, + final String typeName, final boolean waitUntilLeader, final String... shardNames) throws Exception { + return setupDataStore(implementation, typeName, "module-shards.conf", waitUntilLeader, + SchemaContextHelper.full(), shardNames); } - public AbstractDataStore setupAbstractDataStore(final Class implementation, - final String typeName, final String... shardNames) - throws Exception { - return setupAbstractDataStore(implementation, typeName, "module-shards.conf", true, - SchemaContextHelper.full(), shardNames); + public ClientBackedDataStore setupDataStore(final Class implementation, + final String typeName, final String moduleShardsConfig, final boolean waitUntilLeader, + final String... shardNames) throws Exception { + return setupDataStore(implementation, typeName, moduleShardsConfig, waitUntilLeader, + SchemaContextHelper.full(), shardNames); } - public AbstractDataStore setupAbstractDataStore(final Class implementation, - final String typeName, final boolean waitUntilLeader, - final String... shardNames) throws Exception { - return setupAbstractDataStore(implementation, typeName, "module-shards.conf", waitUntilLeader, - SchemaContextHelper.full(), shardNames); + public ClientBackedDataStore setupDataStore(final Class implementation, + final String typeName, final String moduleShardsConfig, final boolean waitUntilLeader, + final EffectiveModelContext schemaContext, final String... shardNames) throws Exception { + return setupDataStore(implementation, typeName, moduleShardsConfig, "modules.conf", waitUntilLeader, + schemaContext, shardNames); } - public AbstractDataStore setupAbstractDataStore(final Class implementation, - final String typeName, final String moduleShardsConfig, - final boolean waitUntilLeader, final String... shardNames) - throws Exception { - return setupAbstractDataStore(implementation, typeName, moduleShardsConfig, waitUntilLeader, - SchemaContextHelper.full(), shardNames); - } - - public AbstractDataStore setupAbstractDataStore(final Class implementation, - final String typeName, final String moduleShardsConfig, - final boolean waitUntilLeader, - final SchemaContext schemaContext, - final String... shardNames) throws Exception { - return setupAbstractDataStore(implementation, typeName, moduleShardsConfig, "modules.conf", waitUntilLeader, - schemaContext, shardNames); - } - - private AbstractDataStore setupAbstractDataStore(final Class implementation, - final String typeName, final String moduleShardsConfig, - final String modulesConfig, final boolean waitUntilLeader, - final SchemaContext schemaContext, final String... shardNames) - throws Exception { + private ClientBackedDataStore setupDataStore(final Class implementation, + final String typeName, final String moduleShardsConfig, final String modulesConfig, + final boolean waitUntilLeader, final EffectiveModelContext schemaContext, final String... shardNames) + throws Exception { final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); final Configuration config = new ConfigurationImpl(moduleShardsConfig, modulesConfig); setDataStoreName(typeName); final DatastoreContext datastoreContext = datastoreContextBuilder.build(); - final DatastoreContextFactory mockContextFactory = Mockito.mock(DatastoreContextFactory.class); - Mockito.doReturn(datastoreContext).when(mockContextFactory).getBaseDatastoreContext(); - Mockito.doReturn(datastoreContext).when(mockContextFactory).getShardDatastoreContext(Mockito.anyString()); + final DatastoreContextFactory mockContextFactory = mock(DatastoreContextFactory.class); + doReturn(datastoreContext).when(mockContextFactory).getBaseDatastoreContext(); + doReturn(datastoreContext).when(mockContextFactory).getShardDatastoreContext(anyString()); - final Constructor constructor = implementation.getDeclaredConstructor( - ActorSystem.class, ClusterWrapper.class, Configuration.class, - DatastoreContextFactory.class, DatastoreSnapshot.class); + final var constructor = implementation.getDeclaredConstructor(ActorSystem.class, ClusterWrapper.class, + Configuration.class, DatastoreContextFactory.class, DatastoreSnapshot.class); - final AbstractDataStore dataStore = constructor.newInstance(getSystem(), cluster, config, mockContextFactory, + final var dataStore = constructor.newInstance(getSystem(), cluster, config, mockContextFactory, restoreFromSnapshot); - dataStore.onGlobalContextUpdated(schemaContext); + dataStore.onModelContextUpdated(schemaContext); if (waitUntilLeader) { - waitUntilLeader(dataStore.getActorContext(), shardNames); + waitUntilLeader(dataStore.getActorUtils(), shardNames); } datastoreContextBuilder = DatastoreContext.newBuilderFrom(datastoreContext); @@ -164,55 +141,9 @@ public class IntegrationTestKit extends ShardTestKit { } } - public DistributedDataStore setupDistributedDataStoreWithoutConfig(final String typeName, - final SchemaContext schemaContext) { - final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); - final ConfigurationImpl configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()); - - setDataStoreName(typeName); - - final DatastoreContext datastoreContext = getDatastoreContextBuilder().build(); - - final DatastoreContextFactory mockContextFactory = Mockito.mock(DatastoreContextFactory.class); - Mockito.doReturn(datastoreContext).when(mockContextFactory).getBaseDatastoreContext(); - Mockito.doReturn(datastoreContext).when(mockContextFactory).getShardDatastoreContext(Mockito.anyString()); - - final DistributedDataStore dataStore = new DistributedDataStore(getSystem(), cluster, - configuration, mockContextFactory, restoreFromSnapshot); - - dataStore.onGlobalContextUpdated(schemaContext); - - datastoreContextBuilder = DatastoreContext.newBuilderFrom(datastoreContext); - return dataStore; - } - - public DistributedDataStore setupDistributedDataStoreWithoutConfig(final String typeName, - final SchemaContext schemaContext, - final LogicalDatastoreType storeType) { - final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); - final ConfigurationImpl configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()); - - setDataStoreName(typeName); - - final DatastoreContext datastoreContext = - getDatastoreContextBuilder().logicalStoreType(storeType).build(); - - final DatastoreContextFactory mockContextFactory = Mockito.mock(DatastoreContextFactory.class); - Mockito.doReturn(datastoreContext).when(mockContextFactory).getBaseDatastoreContext(); - Mockito.doReturn(datastoreContext).when(mockContextFactory).getShardDatastoreContext(Mockito.anyString()); - - final DistributedDataStore dataStore = new DistributedDataStore(getSystem(), cluster, - configuration, mockContextFactory, restoreFromSnapshot); - - dataStore.onGlobalContextUpdated(schemaContext); - - datastoreContextBuilder = DatastoreContext.newBuilderFrom(datastoreContext); - return dataStore; - } - - public void waitUntilLeader(final ActorContext actorContext, final String... shardNames) { + public void waitUntilLeader(final ActorUtils actorUtils, final String... shardNames) { for (String shardName: shardNames) { - ActorRef shard = findLocalShard(actorContext, shardName); + ActorRef shard = findLocalShard(actorUtils, shardName); assertNotNull("Shard was not created for " + shardName, shard); @@ -220,9 +151,9 @@ public class IntegrationTestKit extends ShardTestKit { } } - public void waitUntilNoLeader(final ActorContext actorContext, final String... shardNames) { + public void waitUntilNoLeader(final ActorUtils actorUtils, final String... shardNames) { for (String shardName: shardNames) { - ActorRef shard = findLocalShard(actorContext, shardName); + ActorRef shard = findLocalShard(actorUtils, shardName); assertNotNull("No local shard found for " + shardName, shard); waitUntilNoLeader(shard); @@ -247,23 +178,22 @@ public class IntegrationTestKit extends ShardTestKit { fail("Member(s) " + otherMembersSet + " are not Up"); } - public static ActorRef findLocalShard(final ActorContext actorContext, final String shardName) { - ActorRef shard = null; - for (int i = 0; i < 20 * 5 && shard == null; i++) { + public static ActorRef findLocalShard(final ActorUtils actorUtils, final String shardName) { + for (int i = 0; i < 20 * 5; i++) { Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); - com.google.common.base.Optional shardReply = actorContext.findLocalShard(shardName); + Optional shardReply = actorUtils.findLocalShard(shardName); if (shardReply.isPresent()) { - shard = shardReply.get(); + return shardReply.orElseThrow(); } } - return shard; + return null; } - public static void waitUntilShardIsDown(final ActorContext actorContext, final String shardName) { + public static void waitUntilShardIsDown(final ActorUtils actorUtils, final String shardName) { for (int i = 0; i < 20 * 5 ; i++) { LOG.debug("Waiting for shard down {}", shardName); Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); - com.google.common.base.Optional shardReply = actorContext.findLocalShard(shardName); + Optional shardReply = actorUtils.findLocalShard(shardName); if (!shardReply.isPresent()) { return; } @@ -272,17 +202,17 @@ public class IntegrationTestKit extends ShardTestKit { throw new IllegalStateException("Shard[" + shardName + " did not shutdown in time"); } - public static void verifyShardStats(final AbstractDataStore datastore, final String shardName, + public static void verifyShardStats(final ClientBackedDataStore datastore, final String shardName, final ShardStatsVerifier verifier) throws Exception { - ActorContext actorContext = datastore.getActorContext(); + ActorUtils actorUtils = datastore.getActorUtils(); - Future future = actorContext.findLocalShardAsync(shardName); - ActorRef shardActor = Await.result(future, Duration.create(10, TimeUnit.SECONDS)); + Future future = actorUtils.findLocalShardAsync(shardName); + ActorRef shardActor = Await.result(future, FiniteDuration.create(10, TimeUnit.SECONDS)); AssertionError lastError = null; Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.SECONDS) <= 5) { - ShardStats shardStats = (ShardStats)actorContext + ShardStats shardStats = (ShardStats)actorUtils .executeOperation(shardActor, Shard.GET_SHARD_MBEAN_MESSAGE); try { @@ -297,17 +227,17 @@ public class IntegrationTestKit extends ShardTestKit { throw lastError; } - public static void verifyShardState(final AbstractDataStore datastore, final String shardName, + public static void verifyShardState(final ClientBackedDataStore datastore, final String shardName, final Consumer verifier) throws Exception { - ActorContext actorContext = datastore.getActorContext(); + ActorUtils actorUtils = datastore.getActorUtils(); - Future future = actorContext.findLocalShardAsync(shardName); - ActorRef shardActor = Await.result(future, Duration.create(10, TimeUnit.SECONDS)); + Future future = actorUtils.findLocalShardAsync(shardName); + ActorRef shardActor = Await.result(future, FiniteDuration.create(10, TimeUnit.SECONDS)); AssertionError lastError = null; Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.SECONDS) <= 5) { - OnDemandShardState shardState = (OnDemandShardState)actorContext + OnDemandShardState shardState = (OnDemandShardState)actorUtils .executeOperation(shardActor, GetOnDemandRaftState.INSTANCE); try { @@ -322,8 +252,8 @@ public class IntegrationTestKit extends ShardTestKit { throw lastError; } - void testWriteTransaction(final AbstractDataStore dataStore, final YangInstanceIdentifier nodePath, - final NormalizedNode nodeToWrite) throws Exception { + void testWriteTransaction(final ClientBackedDataStore dataStore, final YangInstanceIdentifier nodePath, + final NormalizedNode nodeToWrite) throws Exception { // 1. Create a write-only Tx @@ -345,10 +275,7 @@ public class IntegrationTestKit extends ShardTestKit { // 5. Verify the data in the store DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); - - Optional> optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS); - assertTrue("isPresent", optional.isPresent()); - assertEquals("Data node", nodeToWrite, optional.get()); + assertEquals(Optional.of(nodeToWrite), readTx.read(nodePath).get(5, TimeUnit.SECONDS)); } public void doCommit(final DOMStoreThreePhaseCommitCohort cohort) throws Exception { @@ -366,32 +293,11 @@ public class IntegrationTestKit extends ShardTestKit { cohort.commit().get(5, TimeUnit.SECONDS); } - @SuppressWarnings("checkstyle:IllegalCatch") - void assertExceptionOnCall(final Callable callable, final Class expType) { - try { - callable.call(); - fail("Expected " + expType.getSimpleName()); - } catch (Exception e) { - assertEquals("Exception type", expType, e.getClass()); - } - } - void assertExceptionOnTxChainCreates(final DOMStoreTransactionChain txChain, final Class expType) { - assertExceptionOnCall(() -> { - txChain.newWriteOnlyTransaction(); - return null; - }, expType); - - assertExceptionOnCall(() -> { - txChain.newReadWriteTransaction(); - return null; - }, expType); - - assertExceptionOnCall(() -> { - txChain.newReadOnlyTransaction(); - return null; - }, expType); + assertThrows(expType, () -> txChain.newWriteOnlyTransaction()); + assertThrows(expType, () -> txChain.newReadWriteTransaction()); + assertThrows(expType, () -> txChain.newReadOnlyTransaction()); } public interface ShardStatsVerifier {