import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.opendaylight.controller.cluster.datastore.DataStoreVersions.CURRENT_VERSION;
+import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.successfulCanCommit;
+import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.successfulCommit;
+import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.successfulPreCommit;
+
import akka.actor.ActorRef;
import akka.actor.PoisonPill;
import akka.actor.Props;
import akka.pattern.Patterns;
import akka.testkit.TestActorRef;
import akka.util.Timeout;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.primitives.UnsignedLong;
+import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Uninterruptibles;
+import java.io.IOException;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
import java.util.Set;
+import java.util.SortedSet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import org.opendaylight.controller.cluster.access.concepts.MemberName;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.DatastoreContext.Builder;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications;
import org.opendaylight.controller.cluster.datastore.messages.ForwardedReadyTransaction;
+import org.opendaylight.controller.cluster.datastore.modification.MergeModification;
import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
-import org.opendaylight.controller.cluster.datastore.utils.SerializationUtils;
+import org.opendaylight.controller.cluster.datastore.persisted.CommitTransactionPayload;
+import org.opendaylight.controller.cluster.datastore.persisted.MetadataShardDataTreeSnapshot;
+import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState;
import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
-import org.opendaylight.controller.cluster.raft.Snapshot;
import org.opendaylight.controller.cluster.raft.TestActorFactory;
+import org.opendaylight.controller.cluster.raft.persisted.Snapshot;
import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal;
import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore;
import org.opendaylight.controller.md.cluster.datastore.model.CarsModel;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
-import org.opendaylight.yangtools.concepts.Identifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import scala.concurrent.Await;
import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
+import scala.concurrent.duration.FiniteDuration;
/**
* Abstract base for shard unit tests.
*
* @author Thomas Pantelis
*/
-public abstract class AbstractShardTest extends AbstractActorTest{
+public abstract class AbstractShardTest extends AbstractActorTest {
protected static final SchemaContext SCHEMA_CONTEXT = TestModel.createTestContext();
private static final AtomicInteger NEXT_SHARD_NUM = new AtomicInteger();
+ protected static final int HEARTBEAT_MILLIS = 100;
+
protected final ShardIdentifier shardID = ShardIdentifier.create("inventory", MemberName.forName("member-1"),
"config" + NEXT_SHARD_NUM.getAndIncrement());
- protected final Builder dataStoreContextBuilder = DatastoreContext.newBuilder().
- shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).
- shardHeartbeatIntervalInMillis(100);
+ protected final Builder dataStoreContextBuilder = DatastoreContext.newBuilder()
+ .shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000)
+ .shardHeartbeatIntervalInMillis(HEARTBEAT_MILLIS);
protected final TestActorFactory actorFactory = new TestActorFactory(getSystem());
}
protected Shard.Builder newShardBuilder() {
- return Shard.builder().id(shardID).datastoreContext(newDatastoreContext()).schemaContext(SCHEMA_CONTEXT);
+ return Shard.builder().id(shardID).datastoreContext(newDatastoreContext())
+ .schemaContextProvider(() -> SCHEMA_CONTEXT);
}
protected void testRecovery(final Set<Integer> listEntryKeys) throws Exception {
final CountDownLatch recoveryComplete = new CountDownLatch(1);
- @SuppressWarnings("serial")
- final Creator<Shard> creator = new Creator<Shard>() {
+ final Creator<Shard> creator = () -> new Shard(newShardBuilder()) {
@Override
- public Shard create() throws Exception {
- return new Shard(newShardBuilder()) {
- @Override
- protected void onRecoveryComplete() {
- try {
- super.onRecoveryComplete();
- } finally {
- recoveryComplete.countDown();
- }
- }
- };
+ protected void onRecoveryComplete() {
+ try {
+ super.onRecoveryComplete();
+ } finally {
+ recoveryComplete.countDown();
+ }
}
};
final TestActorRef<Shard> shard = TestActorRef.create(getSystem(),
- Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), "testRecovery");
+ Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
+ "testRecovery");
- assertEquals("Recovery complete", true, recoveryComplete.await(5, TimeUnit.SECONDS));
+ assertTrue("Recovery complete", recoveryComplete.await(5, TimeUnit.SECONDS));
// Verify data in the data store.
assertNotNull(TestModel.OUTER_LIST_QNAME.getLocalName() + " not found", outerList);
assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " value is not Iterable",
outerList.getValue() instanceof Iterable);
- for(final Object entry: (Iterable<?>) outerList.getValue()) {
+ for (final Object entry: (Iterable<?>) outerList.getValue()) {
assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " entry is not MapEntryNode",
entry instanceof MapEntryNode);
final MapEntryNode mapEntry = (MapEntryNode)entry;
mapEntry.getChild(new YangInstanceIdentifier.NodeIdentifier(TestModel.ID_QNAME));
assertTrue("Missing leaf " + TestModel.ID_QNAME.getLocalName(), idLeaf.isPresent());
final Object value = idLeaf.get().getValue();
- assertTrue("Unexpected value for leaf "+ TestModel.ID_QNAME.getLocalName() + ": " + value,
+ assertTrue("Unexpected value for leaf " + TestModel.ID_QNAME.getLocalName() + ": " + value,
listEntryKeys.remove(value));
}
- if(!listEntryKeys.isEmpty()) {
- fail("Missing " + TestModel.OUTER_LIST_QNAME.getLocalName() + " entries with keys: " +
- listEntryKeys);
+ if (!listEntryKeys.isEmpty()) {
+ fail("Missing " + TestModel.OUTER_LIST_QNAME.getLocalName() + " entries with keys: " + listEntryKeys);
}
assertEquals("Last log index", nListEntries,
protected void verifyLastApplied(final TestActorRef<Shard> shard, final long expectedValue) {
long lastApplied = -1;
- for(int i = 0; i < 20 * 5; i++) {
+ for (int i = 0; i < 20 * 5; i++) {
lastApplied = shard.underlyingActor().getShardMBean().getLastApplied();
- if(lastApplied == expectedValue) {
+ if (lastApplied == expectedValue) {
return;
}
Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
Assert.fail(String.format("Expected last applied: %d, Actual: %d", expectedValue, lastApplied));
}
- protected ShardDataTreeCohort setupMockWriteTransaction(final String cohortName,
- final ShardDataTree dataStore, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
- final MutableCompositeModification modification) {
- return setupMockWriteTransaction(cohortName, dataStore, path, data, modification, null);
- }
+ protected DataTree createDelegatingMockDataTree() throws Exception {
+ final DataTree actual = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION);
+ final DataTree mock = mock(DataTree.class);
- protected ShardDataTreeCohort setupMockWriteTransaction(final String cohortName,
- final ShardDataTree dataStore, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
- final MutableCompositeModification modification,
- final Function<ShardDataTreeCohort, ListenableFuture<Void>> preCommit) {
+ doAnswer(invocation -> {
+ actual.validate(invocation.getArgument(0));
+ return null;
+ }).when(mock).validate(any(DataTreeModification.class));
- final ReadWriteShardDataTreeTransaction tx = dataStore.newReadWriteTransaction("setup-mock-" + cohortName, null);
- tx.getSnapshot().write(path, data);
- final ShardDataTreeCohort cohort = createDelegatingMockCohort(cohortName, dataStore.finishTransaction(tx), preCommit);
+ doAnswer(invocation -> actual.prepare(invocation.getArgument(0))).when(
+ mock).prepare(any(DataTreeModification.class));
- modification.addModification(new WriteModification(path, data));
-
- return cohort;
- }
+ doAnswer(invocation -> {
+ actual.commit(invocation.getArgument(0));
+ return null;
+ }).when(mock).commit(any(DataTreeCandidate.class));
- protected ShardDataTreeCohort createDelegatingMockCohort(final String cohortName,
- final ShardDataTreeCohort actual) {
- return createDelegatingMockCohort(cohortName, actual, null);
- }
+ doAnswer(invocation -> {
+ actual.setSchemaContext(invocation.getArgument(0));
+ return null;
+ }).when(mock).setSchemaContext(any(SchemaContext.class));
- protected ShardDataTreeCohort createDelegatingMockCohort(final String cohortName,
- final ShardDataTreeCohort actual,
- final Function<ShardDataTreeCohort, ListenableFuture<Void>> preCommit) {
- final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, cohortName);
+ doAnswer(invocation -> actual.takeSnapshot()).when(mock).takeSnapshot();
- doAnswer(new Answer<ListenableFuture<Boolean>>() {
- @Override
- public ListenableFuture<Boolean> answer(final InvocationOnMock invocation) {
- return actual.canCommit();
- }
- }).when(cohort).canCommit();
+ doAnswer(invocation -> actual.getRootPath()).when(mock).getRootPath();
- doAnswer(new Answer<ListenableFuture<Void>>() {
- @Override
- public ListenableFuture<Void> answer(final InvocationOnMock invocation) throws Throwable {
- if(preCommit != null) {
- return preCommit.apply(actual);
- } else {
- return actual.preCommit();
- }
- }
- }).when(cohort).preCommit();
-
- doAnswer(new Answer<ListenableFuture<Void>>() {
- @Override
- public ListenableFuture<Void> answer(final InvocationOnMock invocation) throws Throwable {
- return actual.commit();
- }
- }).when(cohort).commit();
-
- doAnswer(new Answer<ListenableFuture<Void>>() {
- @Override
- public ListenableFuture<Void> answer(final InvocationOnMock invocation) throws Throwable {
- return actual.abort();
- }
- }).when(cohort).abort();
-
- doAnswer(new Answer<DataTreeCandidateTip>() {
- @Override
- public DataTreeCandidateTip answer(final InvocationOnMock invocation) {
- return actual.getCandidate();
- }
- }).when(cohort).getCandidate();
-
- return cohort;
- }
-
- protected Object prepareReadyTransactionMessage(boolean remoteReadWriteTransaction, Shard shard, ShardDataTreeCohort cohort,
- String transactionID,
- MutableCompositeModification modification,
- boolean doCommitOnReady) {
- if(remoteReadWriteTransaction){
- return prepareForwardedReadyTransaction(cohort, transactionID, CURRENT_VERSION,
- doCommitOnReady);
- } else {
- setupCohortDecorator(shard, cohort);
- return prepareBatchedModifications(transactionID, modification, doCommitOnReady);
- }
+ return mock;
}
protected ShardDataTreeCohort mockShardDataTreeCohort() {
ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class);
- doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit();
- doReturn(Futures.immediateFuture(null)).when(cohort).preCommit();
- doReturn(Futures.immediateFuture(null)).when(cohort).commit();
- doReturn(mockCandidate("candidate")).when(cohort).getCandidate();
+ DataTreeCandidate candidate = mockCandidate("candidate");
+ successfulCanCommit(cohort);
+ successfulPreCommit(cohort, candidate);
+ successfulCommit(cohort);
+ doReturn(candidate).when(cohort).getCandidate();
return cohort;
}
- static ShardDataTreeTransactionParent newShardDataTreeTransactionParent(ShardDataTreeCohort cohort) {
- ShardDataTreeTransactionParent mockParent = mock(ShardDataTreeTransactionParent.class);
- doReturn(cohort).when(mockParent).finishTransaction(any(ReadWriteShardDataTreeTransaction.class));
- doNothing().when(mockParent).abortTransaction(any(AbstractShardDataTreeTransaction.class));
- return mockParent;
- }
-
- protected ForwardedReadyTransaction prepareForwardedReadyTransaction(ShardDataTreeCohort cohort,
- String transactionID, short version, boolean doCommitOnReady) {
- return new ForwardedReadyTransaction(transactionID, version,
- new ReadWriteShardDataTreeTransaction(newShardDataTreeTransactionParent(cohort), transactionID,
- mock(DataTreeModification.class)), doCommitOnReady);
- }
-
- protected Object prepareReadyTransactionMessage(boolean remoteReadWriteTransaction, Shard shard, ShardDataTreeCohort cohort,
- String transactionID,
- MutableCompositeModification modification) {
- return prepareReadyTransactionMessage(remoteReadWriteTransaction, shard, cohort, transactionID, modification, false);
- }
+ protected Map<TransactionIdentifier, CapturingShardDataTreeCohort> setupCohortDecorator(final Shard shard,
+ final TransactionIdentifier... transactionIDs) {
+ final Map<TransactionIdentifier, CapturingShardDataTreeCohort> cohortMap = new HashMap<>();
+ for (TransactionIdentifier id: transactionIDs) {
+ cohortMap.put(id, new CapturingShardDataTreeCohort());
+ }
- protected void setupCohortDecorator(Shard shard, final ShardDataTreeCohort cohort) {
- shard.getCommitCoordinator().setCohortDecorator(new ShardCommitCoordinator.CohortDecorator() {
- @Override
- public ShardDataTreeCohort decorate(Identifier transactionID, ShardDataTreeCohort actual) {
- return cohort;
- }
+ shard.getCommitCoordinator().setCohortDecorator((transactionID, actual) -> {
+ CapturingShardDataTreeCohort cohort = cohortMap.get(transactionID);
+ cohort.setDelegate(actual);
+ return cohort;
});
+
+ return cohortMap;
}
- protected BatchedModifications prepareBatchedModifications(String transactionID,
- MutableCompositeModification modification) {
+ protected BatchedModifications prepareBatchedModifications(final TransactionIdentifier transactionID,
+ final MutableCompositeModification modification) {
return prepareBatchedModifications(transactionID, modification, false);
}
- private static BatchedModifications prepareBatchedModifications(String transactionID,
- MutableCompositeModification modification,
- boolean doCommitOnReady) {
- final BatchedModifications batchedModifications = new BatchedModifications(transactionID, CURRENT_VERSION, null);
+ protected static BatchedModifications prepareBatchedModifications(final TransactionIdentifier transactionID,
+ final MutableCompositeModification modification,
+ final boolean doCommitOnReady) {
+ final BatchedModifications batchedModifications = new BatchedModifications(transactionID, CURRENT_VERSION);
batchedModifications.addModification(modification);
- batchedModifications.setReady(true);
+ batchedModifications.setReady();
batchedModifications.setDoCommitOnReady(doCommitOnReady);
batchedModifications.setTotalMessagesSent(1);
return batchedModifications;
}
+ protected static BatchedModifications prepareBatchedModifications(final TransactionIdentifier transactionID,
+ final YangInstanceIdentifier path, final NormalizedNode<?, ?> data, final boolean doCommitOnReady) {
+ final MutableCompositeModification modification = new MutableCompositeModification();
+ modification.addModification(new WriteModification(path, data));
+ return prepareBatchedModifications(transactionID, modification, doCommitOnReady);
+ }
+
+ protected static ForwardedReadyTransaction prepareForwardedReadyTransaction(final TestActorRef<Shard> shard,
+ final TransactionIdentifier transactionID, final YangInstanceIdentifier path,
+ final NormalizedNode<?, ?> data, final boolean doCommitOnReady) {
+ ReadWriteShardDataTreeTransaction rwTx = shard.underlyingActor().getDataStore()
+ .newReadWriteTransaction(transactionID);
+ rwTx.getSnapshot().write(path, data);
+ return new ForwardedReadyTransaction(transactionID, CURRENT_VERSION, rwTx, doCommitOnReady, Optional.empty());
+ }
- public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard, final YangInstanceIdentifier id)
- throws ExecutionException, InterruptedException {
+ public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard,
+ final YangInstanceIdentifier id) {
return shard.underlyingActor().getDataStore().readNode(id).orNull();
}
public static NormalizedNode<?,?> readStore(final DataTree store, final YangInstanceIdentifier id) {
- return store.takeSnapshot().readNode(id).orNull();
+ return store.takeSnapshot().readNode(id).orElse(null);
}
- public static void writeToStore(final TestActorRef<Shard> shard, final YangInstanceIdentifier id,
+ public void writeToStore(final TestActorRef<Shard> shard, final YangInstanceIdentifier id,
final NormalizedNode<?,?> node) throws InterruptedException, ExecutionException {
- Future<Object> future = Patterns.ask(shard, newBatchedModifications("tx", id, node, true, true, 1),
- new Timeout(5, TimeUnit.SECONDS));
+ Future<Object> future = Patterns.ask(shard, newBatchedModifications(nextTransactionId(),
+ id, node, true, true, 1), new Timeout(5, TimeUnit.SECONDS));
try {
- Await.ready(future, Duration.create(5, TimeUnit.SECONDS));
- } catch(TimeoutException e) {
+ Await.ready(future, FiniteDuration.create(5, TimeUnit.SECONDS));
+ } catch (TimeoutException e) {
throw new ExecutionException(e);
}
}
public static void writeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
- final NormalizedNode<?,?> node) throws InterruptedException, ExecutionException {
- final ReadWriteShardDataTreeTransaction transaction = store.newReadWriteTransaction("writeToStore", null);
-
- transaction.getSnapshot().write(id, node);
- final ShardDataTreeCohort cohort = transaction.ready();
- cohort.canCommit().get();
- cohort.preCommit().get();
- cohort.commit();
- }
-
- public static void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
- final NormalizedNode<?,?> node) throws InterruptedException, ExecutionException {
- final ReadWriteShardDataTreeTransaction transaction = store.newReadWriteTransaction("writeToStore", null);
-
- transaction.getSnapshot().merge(id, node);
- final ShardDataTreeCohort cohort = transaction.ready();
- cohort.canCommit().get();
- cohort.preCommit().get();
- cohort.commit();
+ final NormalizedNode<?,?> node) throws DataValidationFailedException {
+ BatchedModifications batched = newBatchedModifications(nextTransactionId(), id, node, true, true, 1);
+ DataTreeModification modification = store.getDataTree().takeSnapshot().newModification();
+ batched.apply(modification);
+ store.notifyListeners(commitTransaction(store.getDataTree(), modification));
}
public static void writeToStore(final DataTree store, final YangInstanceIdentifier id,
store.commit(candidate);
}
+ public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
+ final NormalizedNode<?,?> node) throws DataValidationFailedException {
+ final BatchedModifications batched = new BatchedModifications(nextTransactionId(), CURRENT_VERSION);
+ batched.addModification(new MergeModification(id, node));
+ batched.setReady();
+ batched.setDoCommitOnReady(true);
+ batched.setTotalMessagesSent(1);
+
+ DataTreeModification modification = store.getDataTree().takeSnapshot().newModification();
+ batched.apply(modification);
+ store.notifyListeners(commitTransaction(store.getDataTree(), modification));
+ }
+
DataTree setupInMemorySnapshotStore() throws DataValidationFailedException {
- final DataTree testStore = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL);
- testStore.setSchemaContext(SCHEMA_CONTEXT);
+ final DataTree testStore = new InMemoryDataTreeFactory().create(
+ DataTreeConfiguration.DEFAULT_OPERATIONAL, SCHEMA_CONTEXT);
writeToStore(testStore, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
- final NormalizedNode<?, ?> root = readStore(testStore, YangInstanceIdentifier.builder().build());
+ final NormalizedNode<?, ?> root = readStore(testStore, YangInstanceIdentifier.EMPTY);
InMemorySnapshotStore.addSnapshot(shardID.toString(), Snapshot.create(
- SerializationUtils.serializeNormalizedNode(root),
- Collections.<ReplicatedLogEntry>emptyList(), 0, 1, -1, -1));
+ new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)),
+ Collections.<ReplicatedLogEntry>emptyList(), 0, 1, -1, -1, 1, null, null));
return testStore;
}
- static DataTreeCandidatePayload payloadForModification(final DataTree source, final DataTreeModification mod) throws DataValidationFailedException {
+ static CommitTransactionPayload payloadForModification(final DataTree source, final DataTreeModification mod,
+ final TransactionIdentifier transactionId) throws DataValidationFailedException, IOException {
source.validate(mod);
final DataTreeCandidate candidate = source.prepare(mod);
source.commit(candidate);
- return DataTreeCandidatePayload.create(candidate);
+ return CommitTransactionPayload.create(transactionId, candidate);
}
- static BatchedModifications newBatchedModifications(final String transactionID, final YangInstanceIdentifier path,
- final NormalizedNode<?, ?> data, final boolean ready, final boolean doCommitOnReady, final int messagesSent) {
- return newBatchedModifications(transactionID, null, path, data, ready, doCommitOnReady, messagesSent);
- }
-
- static BatchedModifications newBatchedModifications(final String transactionID, final String transactionChainID,
- final YangInstanceIdentifier path, final NormalizedNode<?, ?> data, final boolean ready, final boolean doCommitOnReady,
- final int messagesSent) {
- final BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION, transactionChainID);
+ static BatchedModifications newBatchedModifications(final TransactionIdentifier transactionID,
+ final YangInstanceIdentifier path, final NormalizedNode<?, ?> data, final boolean ready,
+ final boolean doCommitOnReady, final int messagesSent) {
+ final BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION);
batched.addModification(new WriteModification(path, data));
- batched.setReady(ready);
+ if (ready) {
+ batched.setReady();
+ }
batched.setDoCommitOnReady(doCommitOnReady);
batched.setTotalMessagesSent(messagesSent);
return batched;
}
+ static BatchedModifications newReadyBatchedModifications(final TransactionIdentifier transactionID,
+ final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
+ final SortedSet<String> participatingShardNames) {
+ final BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION);
+ batched.addModification(new WriteModification(path, data));
+ batched.setReady(Optional.of(participatingShardNames));
+ batched.setTotalMessagesSent(1);
+ return batched;
+ }
+
@SuppressWarnings("unchecked")
- static void verifyOuterListEntry(final TestActorRef<Shard> shard, final Object expIDValue) throws Exception {
+ static void verifyOuterListEntry(final TestActorRef<Shard> shard, final Object expIDValue) {
final NormalizedNode<?, ?> outerList = readStore(shard, TestModel.OUTER_LIST_PATH);
assertNotNull(TestModel.OUTER_LIST_QNAME.getLocalName() + " not found", outerList);
assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " value is not Iterable",
final DataTreeCandidateTip mockCandidate = mock(DataTreeCandidateTip.class, name);
final DataTreeCandidateNode mockCandidateNode = mock(DataTreeCandidateNode.class, name + "-node");
doReturn(ModificationType.WRITE).when(mockCandidateNode).getModificationType();
- doReturn(Optional.of(ImmutableNodes.containerNode(CarsModel.CARS_QNAME))).when(mockCandidateNode).getDataAfter();
+ doReturn(Optional.of(ImmutableNodes.containerNode(CarsModel.CARS_QNAME)))
+ .when(mockCandidateNode).getDataAfter();
doReturn(CarsModel.BASE_PATH).when(mockCandidate).getRootPath();
doReturn(mockCandidateNode).when(mockCandidate).getRootNode();
return mockCandidate;
final DataTreeCandidateTip mockCandidate = mock(DataTreeCandidateTip.class, name);
final DataTreeCandidateNode mockCandidateNode = mock(DataTreeCandidateNode.class, name + "-node");
doReturn(ModificationType.UNMODIFIED).when(mockCandidateNode).getModificationType();
- doReturn(YangInstanceIdentifier.builder().build()).when(mockCandidate).getRootPath();
+ doReturn(YangInstanceIdentifier.EMPTY).when(mockCandidate).getRootPath();
doReturn(mockCandidateNode).when(mockCandidate).getRootNode();
return mockCandidate;
}
- static void commitTransaction(final DataTree store, final DataTreeModification modification) throws DataValidationFailedException {
+ static DataTreeCandidate commitTransaction(final DataTree store, final DataTreeModification modification)
+ throws DataValidationFailedException {
modification.ready();
store.validate(modification);
- store.commit(store.prepare(modification));
+ final DataTreeCandidate candidate = store.prepare(modification);
+ store.commit(candidate);
+ return candidate;
}
@SuppressWarnings("serial")
return delegate.create();
}
}
+
+ public static class CapturingShardDataTreeCohort extends ShardDataTreeCohort {
+ private volatile ShardDataTreeCohort delegate;
+ private FutureCallback<Void> canCommit;
+ private FutureCallback<DataTreeCandidate> preCommit;
+ private FutureCallback<UnsignedLong> commit;
+
+ public void setDelegate(final ShardDataTreeCohort delegate) {
+ this.delegate = delegate;
+ }
+
+ public FutureCallback<Void> getCanCommit() {
+ assertNotNull("canCommit was not invoked", canCommit);
+ return canCommit;
+ }
+
+ public FutureCallback<DataTreeCandidate> getPreCommit() {
+ assertNotNull("preCommit was not invoked", preCommit);
+ return preCommit;
+ }
+
+ public FutureCallback<UnsignedLong> getCommit() {
+ assertNotNull("commit was not invoked", commit);
+ return commit;
+ }
+
+ @Override
+ public TransactionIdentifier getIdentifier() {
+ return delegate.getIdentifier();
+ }
+
+ @Override
+ DataTreeCandidateTip getCandidate() {
+ return delegate.getCandidate();
+ }
+
+ @Override
+ DataTreeModification getDataTreeModification() {
+ return delegate.getDataTreeModification();
+ }
+
+ @Override
+ public void canCommit(final FutureCallback<Void> callback) {
+ canCommit = mockFutureCallback(callback);
+ delegate.canCommit(canCommit);
+ }
+
+ @Override
+ public void preCommit(final FutureCallback<DataTreeCandidate> callback) {
+ preCommit = mockFutureCallback(callback);
+ delegate.preCommit(preCommit);
+ }
+
+ @Override
+ public void commit(final FutureCallback<UnsignedLong> callback) {
+ commit = mockFutureCallback(callback);
+ delegate.commit(commit);
+ }
+
+ @SuppressWarnings("unchecked")
+ private static <T> FutureCallback<T> mockFutureCallback(final FutureCallback<T> actual) {
+ FutureCallback<T> mock = mock(FutureCallback.class);
+ doAnswer(invocation -> {
+ actual.onFailure(invocation.getArgument(0));
+ return null;
+ }).when(mock).onFailure(any(Throwable.class));
+
+ doAnswer(invocation -> {
+ actual.onSuccess(invocation.getArgument(0));
+ return null;
+ }).when(mock).onSuccess((T) nullable(Object.class));
+
+ return mock;
+ }
+
+ @Override
+ public void abort(final FutureCallback<Void> callback) {
+ delegate.abort(callback);
+ }
+
+ @Override
+ public boolean isFailed() {
+ return delegate.isFailed();
+ }
+
+ @Override
+ public State getState() {
+ return delegate.getState();
+ }
+
+ @Override
+ Optional<SortedSet<String>> getParticipatingShardNames() {
+ return delegate.getParticipatingShardNames();
+ }
+ }
}