import akka.pattern.Patterns;
import akka.testkit.TestActorRef;
import akka.util.Timeout;
-import com.google.common.base.Optional;
import com.google.common.primitives.UnsignedLong;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
import org.opendaylight.controller.cluster.datastore.persisted.CommitTransactionPayload;
-import org.opendaylight.controller.cluster.datastore.persisted.PreBoronShardDataTreeSnapshot;
+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.TestActorFactory;
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.TipProducingDataTree;
-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;
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);
+ .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 {
Assert.fail(String.format("Expected last applied: %d, Actual: %d", expectedValue, lastApplied));
}
- protected TipProducingDataTree createDelegatingMockDataTree() throws Exception {
- TipProducingDataTree actual = InMemoryDataTreeFactory.getInstance().create(TreeType.CONFIGURATION);
- final TipProducingDataTree mock = mock(TipProducingDataTree.class);
+ protected DataTree createDelegatingMockDataTree() throws Exception {
+ final DataTree actual = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION);
+ final DataTree mock = mock(DataTree.class);
doAnswer(invocation -> {
actual.validate(invocation.getArgumentAt(0, DataTreeModification.class));
return null;
}).when(mock).validate(any(DataTreeModification.class));
- doAnswer(invocation -> {
- return actual.prepare(invocation.getArgumentAt(0, DataTreeModification.class));
- }).when(mock).prepare(any(DataTreeModification.class));
+ doAnswer(invocation -> actual.prepare(invocation.getArgumentAt(0, DataTreeModification.class))).when(
+ mock).prepare(any(DataTreeModification.class));
doAnswer(invocation -> {
actual.commit(invocation.getArgumentAt(0, DataTreeCandidate.class));
return null;
}).when(mock).setSchemaContext(any(SchemaContext.class));
- doAnswer(invocation -> {
- return actual.takeSnapshot();
- }).when(mock).takeSnapshot();
+ doAnswer(invocation -> actual.takeSnapshot()).when(mock).takeSnapshot();
- doAnswer(invocation -> {
- return actual.getRootPath();
- }).when(mock).getRootPath();
+ doAnswer(invocation -> actual.getRootPath()).when(mock).getRootPath();
return mock;
}
}
public static NormalizedNode<?,?> readStore(final DataTree store, final YangInstanceIdentifier id) {
- return store.takeSnapshot().readNode(id).orNull();
+ return store.takeSnapshot().readNode(id).orElse(null);
}
public void writeToStore(final TestActorRef<Shard> shard, final YangInstanceIdentifier id,
}
public static void writeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
- final NormalizedNode<?,?> node) throws Exception {
+ 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(store.commit(modification));
+ store.notifyListeners(commitTransaction(store.getDataTree(), modification));
}
public static void writeToStore(final DataTree store, final YangInstanceIdentifier id,
}
public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
- final NormalizedNode<?,?> node) throws Exception {
+ final NormalizedNode<?,?> node) throws DataValidationFailedException {
final BatchedModifications batched = new BatchedModifications(nextTransactionId(), CURRENT_VERSION);
batched.addModification(new MergeModification(id, node));
batched.setReady(true);
DataTreeModification modification = store.getDataTree().takeSnapshot().newModification();
batched.apply(modification);
- store.notifyListeners(store.commit(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.EMPTY);
InMemorySnapshotStore.addSnapshot(shardID.toString(), Snapshot.create(
- new ShardSnapshotState(new PreBoronShardDataTreeSnapshot(root)),
+ new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)),
Collections.<ReplicatedLogEntry>emptyList(), 0, 1, -1, -1, 1, null, null));
return testStore;
}
return mockCandidate;
}
- static void commitTransaction(final DataTree store, final DataTreeModification modification)
+ 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")
}
@SuppressWarnings("unchecked")
- private <T> FutureCallback<T> mockFutureCallback(final FutureCallback<T> actual) {
+ private static <T> FutureCallback<T> mockFutureCallback(final FutureCallback<T> actual) {
FutureCallback<T> mock = mock(FutureCallback.class);
doAnswer(invocation -> {
actual.onFailure(invocation.getArgumentAt(0, Throwable.class));