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=82d05352e1387b142e0cdc726c5bdd8a3d7c1a4d;hb=f41c5e6e6f6e10b36b1e4b1992877e38e718c8fb;hp=86c875993ae1e7697c77ff226b5cf6b719dd5e1d;hpb=149feb98f151186975fe42bab5853e05aafd4b51;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 86c875993a..82d05352e1 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 @@ -22,6 +22,7 @@ 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.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; @@ -37,11 +38,11 @@ import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot import org.opendaylight.controller.cluster.datastore.utils.ActorContext; import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftState; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; +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; @@ -57,53 +58,90 @@ public class IntegrationTestKit extends ShardTestKit { protected DatastoreContext.Builder datastoreContextBuilder; protected DatastoreSnapshot restoreFromSnapshot; + private final int commitTimeout; public IntegrationTestKit(final ActorSystem actorSystem, final Builder datastoreContextBuilder) { + this(actorSystem, datastoreContextBuilder, 7); + } + + public IntegrationTestKit(final ActorSystem actorSystem, final Builder datastoreContextBuilder, + final int commitTimeout) { super(actorSystem); this.datastoreContextBuilder = datastoreContextBuilder; + this.commitTimeout = commitTimeout; } public DatastoreContext.Builder getDatastoreContextBuilder() { return datastoreContextBuilder; } - public AbstractDataStore setupDistributedDataStore(final String typeName, final String... shardNames) { - return setupDistributedDataStore(typeName, "module-shards.conf", true, SchemaContextHelper.full(), shardNames); + 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 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 AbstractDataStore setupDistributedDataStore(final String typeName, final boolean waitUntilLeader, - final String... shardNames) { - return setupDistributedDataStore(typeName, "module-shards.conf", waitUntilLeader, + 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 AbstractDataStore setupDistributedDataStore(final String typeName, final String moduleShardsConfig, - final boolean waitUntilLeader, final String... shardNames) { - return setupDistributedDataStore(typeName, moduleShardsConfig, waitUntilLeader, + 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 AbstractDataStore setupDistributedDataStore(final String typeName, final String moduleShardsConfig, - final boolean waitUntilLeader, final SchemaContext schemaContext, final String... shardNames) { - return setupDistributedDataStore(typeName, moduleShardsConfig, "modules.conf", waitUntilLeader, + 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); } - public AbstractDataStore setupDistributedDataStore(final String typeName, final String moduleShardsConfig, - final String modulesConfig, final boolean waitUntilLeader, - final SchemaContext schemaContext, final String... 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 { final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); final Configuration config = new ConfigurationImpl(moduleShardsConfig, modulesConfig); - datastoreContextBuilder.dataStoreName(typeName); + setDataStoreName(typeName); - DatastoreContext datastoreContext = datastoreContextBuilder.build(); - DatastoreContextFactory mockContextFactory = Mockito.mock(DatastoreContextFactory.class); + 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()); - AbstractDataStore dataStore = new DistributedDataStore(getSystem(), cluster, config, mockContextFactory, - restoreFromSnapshot); + final Constructor constructor = implementation.getDeclaredConstructor( + ActorSystem.class, ClusterWrapper.class, Configuration.class, + DatastoreContextFactory.class, DatastoreSnapshot.class); + + final AbstractDataStore dataStore = constructor.newInstance(getSystem(), cluster, config, mockContextFactory, + restoreFromSnapshot); dataStore.onGlobalContextUpdated(schemaContext); @@ -115,12 +153,22 @@ public class IntegrationTestKit extends ShardTestKit { return dataStore; } + private void setDataStoreName(final String typeName) { + if ("config".equals(typeName)) { + datastoreContextBuilder.logicalStoreType(LogicalDatastoreType.CONFIGURATION); + } else if ("operational".equals(typeName)) { + datastoreContextBuilder.logicalStoreType(LogicalDatastoreType.OPERATIONAL); + } else { + datastoreContextBuilder.dataStoreName(typeName); + } + } + public DistributedDataStore setupDistributedDataStoreWithoutConfig(final String typeName, final SchemaContext schemaContext) { final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); final ConfigurationImpl configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()); - getDatastoreContextBuilder().dataStoreName(typeName); + setDataStoreName(typeName); final DatastoreContext datastoreContext = getDatastoreContextBuilder().build(); @@ -143,7 +191,7 @@ public class IntegrationTestKit extends ShardTestKit { final ClusterWrapper cluster = new ClusterWrapperImpl(getSystem()); final ConfigurationImpl configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()); - getDatastoreContextBuilder().dataStoreName(typeName); + setDataStoreName(typeName); final DatastoreContext datastoreContext = getDatastoreContextBuilder().logicalStoreType(storeType).build(); @@ -210,7 +258,7 @@ public class IntegrationTestKit extends ShardTestKit { return shard; } - public static void waitUntilShardIsDown(ActorContext actorContext, String shardName) { + public static void waitUntilShardIsDown(final ActorContext actorContext, final String shardName) { for (int i = 0; i < 20 * 5 ; i++) { LOG.debug("Waiting for shard down {}", shardName); Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); @@ -303,7 +351,7 @@ public class IntegrationTestKit extends ShardTestKit { } public void doCommit(final DOMStoreThreePhaseCommitCohort cohort) throws Exception { - Boolean canCommit = cohort.canCommit().get(7, TimeUnit.SECONDS); + Boolean canCommit = cohort.canCommit().get(commitTimeout, TimeUnit.SECONDS); assertEquals("canCommit", true, canCommit); cohort.preCommit().get(5, TimeUnit.SECONDS); cohort.commit().get(5, TimeUnit.SECONDS); @@ -311,7 +359,7 @@ public class IntegrationTestKit extends ShardTestKit { void doCommit(final ListenableFuture canCommitFuture, final DOMStoreThreePhaseCommitCohort cohort) throws Exception { - Boolean canCommit = canCommitFuture.get(7, TimeUnit.SECONDS); + Boolean canCommit = canCommitFuture.get(commitTimeout, TimeUnit.SECONDS); assertEquals("canCommit", true, canCommit); cohort.preCommit().get(5, TimeUnit.SECONDS); cohort.commit().get(5, TimeUnit.SECONDS);