import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import org.opendaylight.controller.cluster.datastore.modification.ModificationPayload;
-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.utils.SerializationUtils;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationByteStringPayload;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationPayload;
import org.opendaylight.controller.md.cluster.datastore.model.CarsModel;
import org.opendaylight.controller.md.cluster.datastore.model.PeopleModel;
import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
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.TipProducingDataTree;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.SchemaValidationFailedException;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.slf4j.LoggerFactory;
-public class ShardRecoveryCoordinatorTest {
+public class ShardRecoveryCoordinatorTest extends AbstractTest {
private ShardDataTree peopleDataTree;
private SchemaContext peopleSchemaContext;
peopleSchemaContext = SchemaContextHelper.select(SchemaContextHelper.PEOPLE_YANG);
carsSchemaContext = SchemaContextHelper.select(SchemaContextHelper.CARS_YANG);
- peopleDataTree = new ShardDataTree(peopleSchemaContext);
+ peopleDataTree = new ShardDataTree(peopleSchemaContext, TreeType.OPERATIONAL);
}
+ @Deprecated
@Test
public void testAppendRecoveredLogEntryDataTreeCandidatePayload(){
- ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree, peopleSchemaContext, "foobar", LoggerFactory.getLogger("foo"));
+ final ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree,
+ peopleSchemaContext, null, "foobar", LoggerFactory.getLogger("foo"));
coordinator.startLogRecoveryBatch(10);
try {
coordinator.appendRecoveredLogEntry(DataTreeCandidatePayload.create(createCar()));
- } catch(SchemaValidationFailedException e){
+ } catch(final SchemaValidationFailedException e){
fail("SchemaValidationFailedException should not happen if pruning is done");
}
}
@Test
- public void testAppendRecoveredLogEntryModificationPayload() throws IOException {
- ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree, peopleSchemaContext, "foobar", LoggerFactory.getLogger("foo"));
+ public void testAppendRecoveredLogEntryCommitTransactionPayload() throws IOException {
+ final ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree,
+ peopleSchemaContext, null, "foobar", LoggerFactory.getLogger("foo"));
coordinator.startLogRecoveryBatch(10);
try {
- MutableCompositeModification modification = new MutableCompositeModification((short) 1);
- modification.addModification(new WriteModification(CarsModel.BASE_PATH, CarsModel.create()));
- coordinator.appendRecoveredLogEntry(new ModificationPayload(modification));
- } catch(SchemaValidationFailedException e){
+ coordinator.appendRecoveredLogEntry(CommitTransactionPayload.create(nextTransactionId(), createCar()));
+ } catch(final SchemaValidationFailedException e){
fail("SchemaValidationFailedException should not happen if pruning is done");
}
- }
-
- @Test
- public void testAppendRecoveredLogEntryCompositeModificationPayload() throws IOException {
- ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree, peopleSchemaContext, "foobar", LoggerFactory.getLogger("foo"));
- coordinator.startLogRecoveryBatch(10);
- try {
- MutableCompositeModification modification = new MutableCompositeModification((short) 1);
- modification.addModification(new WriteModification(CarsModel.BASE_PATH, CarsModel.create()));
- coordinator.appendRecoveredLogEntry(new CompositeModificationPayload(modification.toSerializable()));
- } catch(SchemaValidationFailedException e){
- fail("SchemaValidationFailedException should not happen if pruning is done");
- }
- }
- @Test
- public void testAppendRecoveredLogEntryCompositeModificationByteStringPayload() throws IOException {
- ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree, peopleSchemaContext, "foobar", LoggerFactory.getLogger("foo"));
- coordinator.startLogRecoveryBatch(10);
- try {
- MutableCompositeModification modification = new MutableCompositeModification((short) 1);
- modification.addModification(new WriteModification(CarsModel.BASE_PATH, CarsModel.create()));
- coordinator.appendRecoveredLogEntry(new CompositeModificationByteStringPayload(modification.toSerializable()));
- } catch(SchemaValidationFailedException e){
- fail("SchemaValidationFailedException should not happen if pruning is done");
- }
-
- assertEquals(false, readCars(peopleDataTree).isPresent());
+ coordinator.applyCurrentLogRecoveryBatch();
}
@Test
public void testApplyRecoverySnapshot(){
- ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree , peopleSchemaContext, "foobar", LoggerFactory.getLogger("foo"));
+ final ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree,
+ peopleSchemaContext, null, "foobar", LoggerFactory.getLogger("foo"));
coordinator.startLogRecoveryBatch(10);
coordinator.applyRecoverySnapshot(createSnapshot());
@Test
public void testApplyCurrentLogRecoveryBatch(){
- ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree, peopleSchemaContext, "foobar", LoggerFactory.getLogger("foo"));
+ final ShardRecoveryCoordinator coordinator = new ShardRecoveryCoordinator(peopleDataTree,
+ peopleSchemaContext, null, "foobar", LoggerFactory.getLogger("foo"));
coordinator.startLogRecoveryBatch(10);
try {
coordinator.applyCurrentLogRecoveryBatch();
- } catch(IllegalArgumentException e){
+ } catch(final IllegalArgumentException e){
fail("IllegalArgumentException should not happen - if the pruning modification delegate is passed");
}
}
private DataTreeCandidateTip createCar(){
- TipProducingDataTree dataTree = InMemoryDataTreeFactory.getInstance().create();
+ final TipProducingDataTree dataTree = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL);
dataTree.setSchemaContext(carsSchemaContext);
- DataTreeSnapshot snapshot = dataTree.takeSnapshot();
+ final DataTreeSnapshot snapshot = dataTree.takeSnapshot();
- DataTreeModification modification = snapshot.newModification();
+ final DataTreeModification modification = snapshot.newModification();
modification.merge(CarsModel.BASE_PATH, CarsModel.create());
-
+ modification.ready();
return dataTree.prepare(modification);
}
- private Optional<NormalizedNode<?,?>> readCars(ShardDataTree shardDataTree){
- TipProducingDataTree dataTree = shardDataTree.getDataTree();
+ private Optional<NormalizedNode<?,?>> readCars(final ShardDataTree shardDataTree){
+ final TipProducingDataTree dataTree = shardDataTree.getDataTree();
+ // FIXME: this should not be called here
dataTree.setSchemaContext(peopleSchemaContext);
- DataTreeSnapshot snapshot = dataTree.takeSnapshot();
-
- DataTreeModification modification = snapshot.newModification();
-
- return modification.readNode(CarsModel.BASE_PATH);
+ return shardDataTree.readNode(CarsModel.BASE_PATH);
}
- private Optional<NormalizedNode<?,?>> readPeople(ShardDataTree shardDataTree){
- TipProducingDataTree dataTree = shardDataTree.getDataTree();
+ private Optional<NormalizedNode<?,?>> readPeople(final ShardDataTree shardDataTree){
+ final TipProducingDataTree dataTree = shardDataTree.getDataTree();
+ // FIXME: this should not be called here
dataTree.setSchemaContext(peopleSchemaContext);
- DataTreeSnapshot snapshot = dataTree.takeSnapshot();
-
- DataTreeModification modification = snapshot.newModification();
-
- return modification.readNode(PeopleModel.BASE_PATH);
+ return shardDataTree.readNode(PeopleModel.BASE_PATH);
}
-
-
- private byte[] createSnapshot(){
- TipProducingDataTree dataTree = InMemoryDataTreeFactory.getInstance().create();
+ private static byte[] createSnapshot(){
+ final TipProducingDataTree dataTree = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL);
dataTree.setSchemaContext(SchemaContextHelper.select(SchemaContextHelper.CARS_YANG, SchemaContextHelper.PEOPLE_YANG));
DataTreeSnapshot snapshot = dataTree.takeSnapshot();
modification.merge(CarsModel.BASE_PATH, CarsModel.create());
modification.merge(PeopleModel.BASE_PATH, PeopleModel.create());
-
- DataTreeCandidateTip prepare = dataTree.prepare(modification);
+ modification.ready();
+ final DataTreeCandidateTip prepare = dataTree.prepare(modification);
dataTree.commit(prepare);
modification = snapshot.newModification();
- Optional<NormalizedNode<?, ?>> optional = modification.readNode(YangInstanceIdentifier.EMPTY);
+ final Optional<NormalizedNode<?, ?>> optional = modification.readNode(YangInstanceIdentifier.EMPTY);
- byte[] bytes = SerializationUtils.serializeNormalizedNode(optional.get());
+ final byte[] bytes = SerializationUtils.serializeNormalizedNode(optional.get());
return bytes;
-
-
}
}
\ No newline at end of file