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=e827cdcaf94659d6006207e85385c9059bdac3e7;hb=33877f41ffc3f8eb36ad8490315419b90817d26e;hp=5ddd8271ea381f21f083ea72986463acba924e8b;hpb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;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 5ddd8271ea..e827cdcaf9 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,6 +9,7 @@ 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.fail; import akka.actor.ActorRef; @@ -28,6 +29,7 @@ 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; @@ -35,7 +37,7 @@ import org.opendaylight.controller.cluster.datastore.config.EmptyModuleShardConf 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; @@ -45,12 +47,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 { @@ -77,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); @@ -115,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); @@ -124,13 +126,17 @@ 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(); @@ -143,10 +149,10 @@ 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.getActorContext(), shardNames); + waitUntilLeader(dataStore.getActorUtils(), shardNames); } datastoreContextBuilder = DatastoreContext.newBuilderFrom(datastoreContext); @@ -164,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()); @@ -179,14 +185,14 @@ public class IntegrationTestKit extends ShardTestKit { 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()); @@ -203,15 +209,15 @@ public class IntegrationTestKit extends ShardTestKit { final DistributedDataStore dataStore = new DistributedDataStore(getSystem(), cluster, configuration, mockContextFactory, restoreFromSnapshot); - dataStore.onGlobalContextUpdated(schemaContext); + dataStore.onModelContextUpdated(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); @@ -219,9 +225,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); @@ -246,11 +252,11 @@ public class IntegrationTestKit extends ShardTestKit { fail("Member(s) " + otherMembersSet + " are not Up"); } - public static ActorRef findLocalShard(final ActorContext actorContext, final String shardName) { + public static ActorRef findLocalShard(final ActorUtils actorUtils, final String shardName) { ActorRef shard = null; for (int i = 0; i < 20 * 5 && shard == null; 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(); } @@ -258,11 +264,11 @@ public class IntegrationTestKit extends ShardTestKit { return shard; } - 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; } @@ -273,15 +279,15 @@ public class IntegrationTestKit extends ShardTestKit { public static void verifyShardStats(final AbstractDataStore 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 { @@ -298,15 +304,15 @@ public class IntegrationTestKit extends ShardTestKit { public static void verifyShardState(final AbstractDataStore 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 { @@ -346,13 +352,13 @@ public class IntegrationTestKit extends ShardTestKit { DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); Optional> optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS); - assertEquals("isPresent", true, optional.isPresent()); + assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", nodeToWrite, optional.get()); } public void doCommit(final DOMStoreThreePhaseCommitCohort cohort) throws Exception { Boolean canCommit = cohort.canCommit().get(commitTimeout, TimeUnit.SECONDS); - assertEquals("canCommit", true, canCommit); + assertEquals("canCommit", Boolean.TRUE, canCommit); cohort.preCommit().get(5, TimeUnit.SECONDS); cohort.commit().get(5, TimeUnit.SECONDS); } @@ -360,7 +366,7 @@ public class IntegrationTestKit extends ShardTestKit { void doCommit(final ListenableFuture canCommitFuture, final DOMStoreThreePhaseCommitCohort cohort) throws Exception { Boolean canCommit = canCommitFuture.get(commitTimeout, TimeUnit.SECONDS); - assertEquals("canCommit", true, canCommit); + assertEquals("canCommit", Boolean.TRUE, canCommit); cohort.preCommit().get(5, TimeUnit.SECONDS); cohort.commit().get(5, TimeUnit.SECONDS); }