import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.Uninterruptibles;
-import java.util.Collections;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
}
protected Props newShardProps() {
- return Shard.props(shardID, Collections.<String,String>emptyMap(),
- newDatastoreContext(), SCHEMA_CONTEXT);
+ return newShardBuilder().props();
+ }
+
+ protected Shard.Builder newShardBuilder() {
+ return Shard.builder().id(shardID).datastoreContext(newDatastoreContext()).schemaContext(SCHEMA_CONTEXT);
}
protected void testRecovery(final Set<Integer> listEntryKeys) throws Exception {
Creator<Shard> creator = new Creator<Shard>() {
@Override
public Shard create() throws Exception {
- return new Shard(shardID, Collections.<String,String>emptyMap(),
- newDatastoreContext(), SCHEMA_CONTEXT) {
+ return new Shard(newShardBuilder()) {
@Override
protected void onRecoveryComplete() {
try {
public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard, final YangInstanceIdentifier id)
throws ExecutionException, InterruptedException {
- return readStore(shard.underlyingActor().getDataStore().getDataTree(), id);
+ return shard.underlyingActor().getDataStore().readNode(id).orNull();
}
public static NormalizedNode<?,?> readStore(final DataTree store, final YangInstanceIdentifier id) {
- final DataTreeSnapshot transaction = store.takeSnapshot();
-
- final Optional<NormalizedNode<?, ?>> optional = transaction.readNode(id);
- final NormalizedNode<?, ?> node = optional.isPresent()? optional.get() : null;
-
- return node;
+ return store.takeSnapshot().readNode(id).orNull();
}
public static void writeToStore(final TestActorRef<Shard> shard, final YangInstanceIdentifier id,
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();
+ }
+
public static void writeToStore(final DataTree store, final YangInstanceIdentifier id,
final NormalizedNode<?,?> node) throws DataValidationFailedException {
final DataTreeModification transaction = store.takeSnapshot().newModification();