import akka.actor.Props;
import akka.dispatch.Futures;
import akka.testkit.JavaTestKit;
+import akka.util.Timeout;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.CheckedFuture;
import com.typesafe.config.Config;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import org.junit.AfterClass;
import org.junit.Before;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
+import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
import org.opendaylight.controller.cluster.datastore.DatastoreContext.Builder;
-import org.opendaylight.controller.cluster.datastore.TransactionProxy.TransactionType;
import org.opendaylight.controller.cluster.datastore.TransactionProxyTest.TestException;
+import org.opendaylight.controller.cluster.datastore.config.Configuration;
import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications;
import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply;
import org.opendaylight.controller.cluster.datastore.messages.CommitTransactionReply;
import org.opendaylight.controller.cluster.datastore.messages.CreateTransaction;
+import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionReply;
import org.opendaylight.controller.cluster.datastore.messages.DataExists;
import org.opendaylight.controller.cluster.datastore.messages.DataExistsReply;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryShardInfo;
import org.opendaylight.controller.cluster.datastore.messages.ReadData;
import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply;
+import org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction;
import org.opendaylight.controller.cluster.datastore.messages.ReadyTransactionReply;
import org.opendaylight.controller.cluster.datastore.modification.AbstractModification;
import org.opendaylight.controller.cluster.datastore.modification.Modification;
import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy;
import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory;
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
-import org.opendaylight.controller.cluster.datastore.utils.DoNothingActor;
import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration;
+import org.opendaylight.controller.cluster.raft.utils.DoNothingActor;
+import org.opendaylight.controller.md.cluster.datastore.model.CarsModel;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply;
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.model.api.SchemaContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static ActorSystem system;
private final Configuration configuration = new MockConfiguration() {
+ Map<String, ShardStrategy> strategyMap = ImmutableMap.<String, ShardStrategy>builder().put(
+ "junk", new ShardStrategy() {
+ @Override
+ public String findShard(YangInstanceIdentifier path) {
+ return "junk";
+ }
+ }).put(
+ "cars", new ShardStrategy() {
+ @Override
+ public String findShard(YangInstanceIdentifier path) {
+ return "cars";
+ }
+ }).build();
+
@Override
- public Map<String, ShardStrategy> getModuleNameToShardStrategyMap() {
- return ImmutableMap.<String, ShardStrategy>builder().put(
- "junk", new ShardStrategy() {
- @Override
- public String findShard(YangInstanceIdentifier path) {
- return "junk";
- }
- }).build();
+ public ShardStrategy getStrategyForModule(String moduleName) {
+ return strategyMap.get(moduleName);
}
@Override
- public Optional<String> getModuleNameFromNameSpace(String nameSpace) {
- return TestModel.JUNK_QNAME.getNamespace().toASCIIString().equals(nameSpace) ?
- Optional.of("junk") : Optional.<String>absent();
+ public String getModuleNameFromNameSpace(String nameSpace) {
+ if(TestModel.JUNK_QNAME.getNamespace().toASCIIString().equals(nameSpace)) {
+ return "junk";
+ } else if(CarsModel.BASE_QNAME.getNamespace().toASCIIString().equals(nameSpace)){
+ return "cars";
+ }
+ return null;
}
};
@Mock
protected ActorContext mockActorContext;
+ protected TransactionContextFactory mockComponentFactory;
+
private SchemaContext schemaContext;
@Mock
protected final String memberName = "mock-member";
- protected final Builder dataStoreContextBuilder = DatastoreContext.newBuilder().operationTimeoutInSeconds(2);
+ private final int operationTimeoutInSeconds = 2;
+ protected final Builder dataStoreContextBuilder = DatastoreContext.newBuilder()
+ .operationTimeoutInSeconds(operationTimeoutInSeconds);
@BeforeClass
public static void setUpClass() throws IOException {
doReturn(getSystem()).when(mockActorContext).getActorSystem();
doReturn(getSystem().dispatchers().defaultGlobalDispatcher()).when(mockActorContext).getClientDispatcher();
- doReturn(memberName).when(mockActorContext).getCurrentMemberName();
+ doReturn(MemberName.forName(memberName)).when(mockActorContext).getCurrentMemberName();
+ doReturn(new ShardStrategyFactory(configuration)).when(mockActorContext).getShardStrategyFactory();
doReturn(schemaContext).when(mockActorContext).getSchemaContext();
+ doReturn(new Timeout(operationTimeoutInSeconds, TimeUnit.SECONDS)).when(mockActorContext).getOperationTimeout();
doReturn(mockClusterWrapper).when(mockActorContext).getClusterWrapper();
doReturn(mockClusterWrapper).when(mockActorContext).getClusterWrapper();
doReturn(dataStoreContextBuilder.build()).when(mockActorContext).getDatastoreContext();
- doReturn(10).when(mockActorContext).getTransactionOutstandingOperationLimit();
+
+ final ClientIdentifier mockClientId = MockIdentifiers.clientIdentifier(getClass(), memberName);
+ mockComponentFactory = new TransactionContextFactory(mockActorContext, mockClientId);
Timer timer = new MetricRegistry().timer("test");
doReturn(timer).when(mockActorContext).getOperationTimer(any(String.class));
-
- ShardStrategyFactory.setConfiguration(configuration);
}
protected ActorSystem getSystem() {
ArgumentMatcher<CreateTransaction> matcher = new ArgumentMatcher<CreateTransaction>() {
@Override
public boolean matches(Object argument) {
- if(CreateTransaction.SERIALIZABLE_CLASS.equals(argument.getClass())) {
+ if(CreateTransaction.class.equals(argument.getClass())) {
CreateTransaction obj = CreateTransaction.fromSerializable(argument);
- return obj.getTransactionId().startsWith(memberName) &&
+ return obj.getTransactionId().startsWith(memberName + ':') &&
obj.getTransactionType() == type.ordinal();
}
return argThat(matcher);
}
- protected DataExists eqSerializedDataExists() {
- ArgumentMatcher<DataExists> matcher = new ArgumentMatcher<DataExists>() {
- @Override
- public boolean matches(Object argument) {
- return DataExists.SERIALIZABLE_CLASS.equals(argument.getClass()) &&
- DataExists.fromSerializable(argument).getPath().equals(TestModel.TEST_PATH);
- }
- };
-
- return argThat(matcher);
- }
-
protected DataExists eqDataExists() {
ArgumentMatcher<DataExists> matcher = new ArgumentMatcher<DataExists>() {
@Override
return argThat(matcher);
}
- protected ReadData eqSerializedReadData() {
- return eqSerializedReadData(TestModel.TEST_PATH);
- }
-
- protected ReadData eqSerializedReadData(final YangInstanceIdentifier path) {
- ArgumentMatcher<ReadData> matcher = new ArgumentMatcher<ReadData>() {
- @Override
- public boolean matches(Object argument) {
- return ReadData.SERIALIZABLE_CLASS.equals(argument.getClass()) &&
- ReadData.fromSerializable(argument).getPath().equals(path);
- }
- };
-
- return argThat(matcher);
+ protected ReadData eqReadData() {
+ return eqReadData(TestModel.TEST_PATH);
}
- protected ReadData eqReadData() {
+ protected ReadData eqReadData(final YangInstanceIdentifier path) {
ArgumentMatcher<ReadData> matcher = new ArgumentMatcher<ReadData>() {
@Override
public boolean matches(Object argument) {
- return (argument instanceof ReadData) &&
- ((ReadData)argument).getPath().equals(TestModel.TEST_PATH);
+ return (argument instanceof ReadData) && ((ReadData)argument).getPath().equals(path);
}
};
return Futures.successful((Object)new ReadyTransactionReply(path));
}
- protected Future<Object> readSerializedDataReply(NormalizedNode<?, ?> data,
- short transactionVersion) {
- return Futures.successful(new ReadDataReply(data, transactionVersion).toSerializable());
- }
-
- protected Future<Object> readSerializedDataReply(NormalizedNode<?, ?> data) {
- return readSerializedDataReply(data, DataStoreVersions.CURRENT_VERSION);
- }
protected Future<ReadDataReply> readDataReply(NormalizedNode<?, ?> data) {
return Futures.successful(new ReadDataReply(data, DataStoreVersions.CURRENT_VERSION));
}
- protected Future<Object> dataExistsSerializedReply(boolean exists) {
- return Futures.successful(DataExistsReply.create(exists).toSerializable());
- }
-
protected Future<DataExistsReply> dataExistsReply(boolean exists) {
- return Futures.successful(DataExistsReply.create(exists));
+ return Futures.successful(new DataExistsReply(exists, DataStoreVersions.CURRENT_VERSION));
}
protected Future<BatchedModificationsReply> batchedModificationsReply(int count) {
return Futures.successful(new BatchedModificationsReply(count));
}
+ @SuppressWarnings("unchecked")
protected Future<Object> incompleteFuture() {
return mock(Future.class);
}
protected void expectBatchedModifications(ActorRef actorRef, int count) {
doReturn(batchedModificationsReply(count)).when(mockActorContext).executeOperationAsync(
- eq(actorSelection(actorRef)), isA(BatchedModifications.class));
+ eq(actorSelection(actorRef)), isA(BatchedModifications.class), any(Timeout.class));
}
protected void expectBatchedModificationsReady(ActorRef actorRef) {
protected void expectBatchedModificationsReady(ActorRef actorRef, boolean doCommitOnReady) {
doReturn(doCommitOnReady ? Futures.successful(new CommitTransactionReply().toSerializable()) :
readyTxReply(actorRef.path().toString())).when(mockActorContext).executeOperationAsync(
- eq(actorSelection(actorRef)), isA(BatchedModifications.class));
+ eq(actorSelection(actorRef)), isA(BatchedModifications.class), any(Timeout.class));
}
protected void expectBatchedModifications(int count) {
doReturn(batchedModificationsReply(count)).when(mockActorContext).executeOperationAsync(
- any(ActorSelection.class), isA(BatchedModifications.class));
+ any(ActorSelection.class), isA(BatchedModifications.class), any(Timeout.class));
}
protected void expectIncompleteBatchedModifications() {
doReturn(incompleteFuture()).when(mockActorContext).executeOperationAsync(
- any(ActorSelection.class), isA(BatchedModifications.class));
+ any(ActorSelection.class), isA(BatchedModifications.class), any(Timeout.class));
}
protected void expectFailedBatchedModifications(ActorRef actorRef) {
doReturn(Futures.failed(new TestException())).when(mockActorContext).executeOperationAsync(
- eq(actorSelection(actorRef)), isA(BatchedModifications.class));
+ eq(actorSelection(actorRef)), isA(BatchedModifications.class), any(Timeout.class));
}
- protected CreateTransactionReply createTransactionReply(ActorRef actorRef, int transactionVersion){
- return CreateTransactionReply.newBuilder()
- .setTransactionActorPath(actorRef.path().toString())
- .setTransactionId("txn-1")
- .setMessageVersion(transactionVersion)
- .build();
+ protected void expectReadyLocalTransaction(ActorRef actorRef, boolean doCommitOnReady) {
+ doReturn(doCommitOnReady ? Futures.successful(new CommitTransactionReply().toSerializable()) :
+ readyTxReply(actorRef.path().toString())).when(mockActorContext).executeOperationAsync(
+ eq(actorSelection(actorRef)), isA(ReadyLocalTransaction.class), any(Timeout.class));
+ }
+
+ protected CreateTransactionReply createTransactionReply(ActorRef actorRef, short transactionVersion){
+ return new CreateTransactionReply(actorRef.path().toString(), "txn-1", transactionVersion);
}
protected ActorRef setupActorContextWithoutInitialCreateTransaction(ActorSystem actorSystem) {
}
protected Future<PrimaryShardInfo> primaryShardInfoReply(ActorSystem actorSystem, ActorRef actorRef) {
+ return primaryShardInfoReply(actorSystem, actorRef, DataStoreVersions.CURRENT_VERSION);
+ }
+
+ protected Future<PrimaryShardInfo> primaryShardInfoReply(ActorSystem actorSystem, ActorRef actorRef,
+ short transactionVersion) {
return Futures.successful(new PrimaryShardInfo(actorSystem.actorSelection(actorRef.path()),
- Optional.<DataTree>absent()));
+ transactionVersion));
}
protected ActorRef setupActorContextWithoutInitialCreateTransaction(ActorSystem actorSystem, String shardName) {
+ return setupActorContextWithoutInitialCreateTransaction(actorSystem, shardName, DataStoreVersions.CURRENT_VERSION);
+ }
+
+ protected ActorRef setupActorContextWithoutInitialCreateTransaction(ActorSystem actorSystem, String shardName,
+ short transactionVersion) {
ActorRef actorRef = actorSystem.actorOf(Props.create(DoNothingActor.class));
log.info("Created mock shard actor {}", actorRef);
doReturn(actorSystem.actorSelection(actorRef.path())).
when(mockActorContext).actorSelection(actorRef.path().toString());
- doReturn(primaryShardInfoReply(actorSystem, actorRef)).
+ doReturn(primaryShardInfoReply(actorSystem, actorRef, transactionVersion)).
when(mockActorContext).findPrimaryShardAsync(eq(shardName));
- doReturn(false).when(mockActorContext).isPathLocal(actorRef.path().toString());
-
- doReturn(10).when(mockActorContext).getTransactionOutstandingOperationLimit();
-
return actorRef;
}
protected ActorRef setupActorContextWithInitialCreateTransaction(ActorSystem actorSystem,
- TransactionType type, int transactionVersion, String shardName) {
- ActorRef shardActorRef = setupActorContextWithoutInitialCreateTransaction(actorSystem, shardName);
+ TransactionType type, short transactionVersion, String shardName) {
+ ActorRef shardActorRef = setupActorContextWithoutInitialCreateTransaction(actorSystem, shardName,
+ transactionVersion);
return setupActorContextWithInitialCreateTransaction(actorSystem, type, transactionVersion,
memberName, shardActorRef);
}
protected ActorRef setupActorContextWithInitialCreateTransaction(ActorSystem actorSystem,
- TransactionType type, int transactionVersion, String prefix, ActorRef shardActorRef) {
+ TransactionType type, short transactionVersion, String prefix, ActorRef shardActorRef) {
ActorRef txActorRef;
- if(type == TransactionType.WRITE_ONLY && transactionVersion >= DataStoreVersions.LITHIUM_VERSION &&
+ if(type == TransactionType.WRITE_ONLY &&
dataStoreContextBuilder.build().isWriteOnlyTransactionOptimizationsEnabled()) {
txActorRef = shardActorRef;
} else {
log.info("Created mock shard Tx actor {}", txActorRef);
doReturn(actorSystem.actorSelection(txActorRef.path())).
- when(mockActorContext).actorSelection(txActorRef.path().toString());
+ when(mockActorContext).actorSelection(txActorRef.path().toString());
doReturn(Futures.successful(createTransactionReply(txActorRef, transactionVersion))).when(mockActorContext).
- executeOperationAsync(eq(actorSystem.actorSelection(shardActorRef.path())),
- eqCreateTransaction(prefix, type));
+ executeOperationAsync(eq(actorSystem.actorSelection(shardActorRef.path())),
+ eqCreateTransaction(prefix, type), any(Timeout.class));
}
return txActorRef;
future.checkedGet(5, TimeUnit.SECONDS);
fail("Expected ReadFailedException");
} catch(ReadFailedException e) {
- throw e.getCause();
+ assertNotNull("Expected a cause", e.getCause());
+ if(e.getCause().getCause() != null) {
+ throw e.getCause().getCause();
+ } else {
+ throw e.getCause();
+ }
}
}
ArgumentCaptor<BatchedModifications> batchedModificationsCaptor =
ArgumentCaptor.forClass(BatchedModifications.class);
verify(mockActorContext, Mockito.atLeastOnce()).executeOperationAsync(
- eq(actorSelection(actorRef)), batchedModificationsCaptor.capture());
+ eq(actorSelection(actorRef)), batchedModificationsCaptor.capture(), any(Timeout.class));
List<BatchedModifications> batchedModifications = filterCaptured(
batchedModificationsCaptor, BatchedModifications.class);
}
}
- for(int i = 0; i < expReplies.length; i++) {
- Object expReply = expReplies[i];
+ for (Object expReply : expReplies) {
boolean found = false;
Iterator<?> iter = futureResults.iterator();
while(iter.hasNext()) {
Object actual = iter.next();
- if(CommitTransactionReply.SERIALIZABLE_CLASS.isInstance(expReply) &&
- CommitTransactionReply.SERIALIZABLE_CLASS.isInstance(actual)) {
+ if(CommitTransactionReply.isSerializedType(expReply) &&
+ CommitTransactionReply.isSerializedType(actual)) {
found = true;
- } else if(expReply instanceof ActorSelection && Objects.equal(expReply, actual)) {
+ } else if(expReply instanceof ActorSelection && Objects.equals(expReply, actual)) {
found = true;
} else if(expReply instanceof Class && ((Class<?>)expReply).isInstance(actual)) {
found = true;
Code Review / controller.git / blobdiff