X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FIntegrationTestKit.java;h=72cfdceeeaff415dd86d189bef84dae0b33ed207;hb=118cd0216b0c6b0ec1a01689ec2025a13e090861;hp=b483be873ff3da98e3da85e5ea320623c5adaa45;hpb=f83b2d36fdd7e953ba72492ffb684cd112aa04a6;p=controller.git 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 b483be873f..72cfdceeea 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; @@ -25,15 +28,13 @@ 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.ActorUtils; @@ -46,7 +47,7 @@ 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; @@ -78,14 +79,14 @@ public class IntegrationTestKit extends ShardTestKit { public DistributedDataStore setupDistributedDataStore(final String typeName, final String moduleShardsConfig, final boolean waitUntilLeader, - final SchemaContext schemaContext) throws Exception { + final EffectiveModelContext schemaContext) throws Exception { return setupDistributedDataStore(typeName, moduleShardsConfig, "modules.conf", waitUntilLeader, schemaContext); } public DistributedDataStore setupDistributedDataStore(final String typeName, final String moduleShardsConfig, final String modulesConfig, final boolean waitUntilLeader, - final SchemaContext schemaContext, + final EffectiveModelContext schemaContext, final String... shardNames) throws Exception { return (DistributedDataStore) setupAbstractDataStore(DistributedDataStore.class, typeName, moduleShardsConfig, modulesConfig, waitUntilLeader, schemaContext, shardNames); @@ -116,7 +117,7 @@ public class IntegrationTestKit extends ShardTestKit { public AbstractDataStore setupAbstractDataStore(final Class implementation, final String typeName, final String moduleShardsConfig, final boolean waitUntilLeader, - final SchemaContext schemaContext, + final EffectiveModelContext schemaContext, final String... shardNames) throws Exception { return setupAbstractDataStore(implementation, typeName, moduleShardsConfig, "modules.conf", waitUntilLeader, schemaContext, shardNames); @@ -125,17 +126,21 @@ public class IntegrationTestKit extends ShardTestKit { private AbstractDataStore setupAbstractDataStore(final Class implementation, final String typeName, final String moduleShardsConfig, final String modulesConfig, final boolean waitUntilLeader, - final SchemaContext schemaContext, final String... shardNames) + final EffectiveModelContext schemaContext, + final String... shardNames) throws Exception { final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); final Configuration config = new ConfigurationImpl(moduleShardsConfig, modulesConfig); setDataStoreName(typeName); + // Make sure we set up datastore context correctly + datastoreContextBuilder.useTellBasedProtocol(ClientBackedDataStore.class.isAssignableFrom(implementation)); + 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, @@ -144,7 +149,7 @@ public class IntegrationTestKit extends ShardTestKit { final AbstractDataStore dataStore = constructor.newInstance(getSystem(), cluster, config, mockContextFactory, restoreFromSnapshot); - dataStore.onGlobalContextUpdated(schemaContext); + dataStore.onModelContextUpdated(schemaContext); if (waitUntilLeader) { waitUntilLeader(dataStore.getActorUtils(), shardNames); @@ -165,7 +170,7 @@ public class IntegrationTestKit extends ShardTestKit { } public DistributedDataStore setupDistributedDataStoreWithoutConfig(final String typeName, - final SchemaContext schemaContext) { + final EffectiveModelContext schemaContext) { final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); final ConfigurationImpl configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()); @@ -173,21 +178,21 @@ public class IntegrationTestKit extends ShardTestKit { 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 DatastoreContextFactory mockContextFactory = mock(DatastoreContextFactory.class); + doReturn(datastoreContext).when(mockContextFactory).getBaseDatastoreContext(); + doReturn(datastoreContext).when(mockContextFactory).getShardDatastoreContext(anyString()); final DistributedDataStore dataStore = new DistributedDataStore(getSystem(), cluster, configuration, mockContextFactory, restoreFromSnapshot); - dataStore.onGlobalContextUpdated(schemaContext); + dataStore.onModelContextUpdated(schemaContext); datastoreContextBuilder = DatastoreContext.newBuilderFrom(datastoreContext); return dataStore; } public DistributedDataStore setupDistributedDataStoreWithoutConfig(final String typeName, - final SchemaContext schemaContext, + final EffectiveModelContext schemaContext, final LogicalDatastoreType storeType) { final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); final ConfigurationImpl configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()); @@ -197,14 +202,14 @@ public class IntegrationTestKit extends ShardTestKit { 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 DatastoreContextFactory mockContextFactory = mock(DatastoreContextFactory.class); + doReturn(datastoreContext).when(mockContextFactory).getBaseDatastoreContext(); + doReturn(datastoreContext).when(mockContextFactory).getShardDatastoreContext(anyString()); final DistributedDataStore dataStore = new DistributedDataStore(getSystem(), cluster, configuration, mockContextFactory, restoreFromSnapshot); - dataStore.onGlobalContextUpdated(schemaContext); + dataStore.onModelContextUpdated(schemaContext); datastoreContextBuilder = DatastoreContext.newBuilderFrom(datastoreContext); return dataStore; @@ -251,7 +256,7 @@ public class IntegrationTestKit extends ShardTestKit { ActorRef shard = null; for (int i = 0; i < 20 * 5 && shard == null; i++) { Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); - com.google.common.base.Optional shardReply = actorUtils.findLocalShard(shardName); + Optional shardReply = actorUtils.findLocalShard(shardName); if (shardReply.isPresent()) { shard = shardReply.get(); } @@ -263,7 +268,7 @@ public class IntegrationTestKit extends ShardTestKit { 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 = actorUtils.findLocalShard(shardName); + Optional shardReply = actorUtils.findLocalShard(shardName); if (!shardReply.isPresent()) { return; } @@ -323,7 +328,7 @@ public class IntegrationTestKit extends ShardTestKit { } void testWriteTransaction(final AbstractDataStore dataStore, final YangInstanceIdentifier nodePath, - final NormalizedNode nodeToWrite) throws Exception { + final NormalizedNode nodeToWrite) throws Exception { // 1. Create a write-only Tx @@ -345,10 +350,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 +368,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 {