X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardTransactionTest.java;h=e0c9ace76001ee289c8ae4266590fd7088bb5f45;hp=9e97d28c2c96454eb409fd8439c79b0f18bb7054;hb=b124e8216055ee30a87207c8b8a95e5c9661f291;hpb=08528168cbcf67ce2b0a897e5ac22888b1da53dd diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java index 9e97d28c2c..e0c9ace760 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java @@ -34,21 +34,12 @@ import org.opendaylight.controller.cluster.datastore.messages.CommitTransactionR import org.opendaylight.controller.cluster.datastore.messages.CreateSnapshot; import org.opendaylight.controller.cluster.datastore.messages.DataExists; import org.opendaylight.controller.cluster.datastore.messages.DataExistsReply; -import org.opendaylight.controller.cluster.datastore.messages.DeleteData; -import org.opendaylight.controller.cluster.datastore.messages.DeleteDataReply; -import org.opendaylight.controller.cluster.datastore.messages.MergeData; -import org.opendaylight.controller.cluster.datastore.messages.MergeDataReply; import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply; -import org.opendaylight.controller.cluster.datastore.messages.ReadyTransaction; import org.opendaylight.controller.cluster.datastore.messages.ReadyTransactionReply; -import org.opendaylight.controller.cluster.datastore.messages.WriteData; -import org.opendaylight.controller.cluster.datastore.messages.WriteDataReply; import org.opendaylight.controller.cluster.datastore.modification.DeleteModification; import org.opendaylight.controller.cluster.datastore.modification.MergeModification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; -import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec; -import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec.Encoded; import org.opendaylight.controller.cluster.datastore.utils.SerializationUtils; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshotReply; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; @@ -89,21 +80,12 @@ public class ShardTransactionTest extends AbstractActorTest { } private ActorRef newTransactionActor(TransactionType type, AbstractShardDataTreeTransaction transaction, String name) { - return newTransactionActor(type, transaction, name, DataStoreVersions.CURRENT_VERSION); - } - - private ActorRef newTransactionActor(TransactionType type, AbstractShardDataTreeTransaction transaction, String name, short version) { - return newTransactionActor(type, transaction, null, name, version); + return newTransactionActor(type, transaction, null, name); } private ActorRef newTransactionActor(TransactionType type, AbstractShardDataTreeTransaction transaction, ActorRef shard, String name) { - return newTransactionActor(type, transaction, null, name, DataStoreVersions.CURRENT_VERSION); - } - - private ActorRef newTransactionActor(TransactionType type, AbstractShardDataTreeTransaction transaction, ActorRef shard, String name, - short version) { Props props = ShardTransaction.props(type, transaction, shard != null ? shard : createShard(), - datastoreContext, shardStats, "txn", version); + datastoreContext, shardStats, "txn"); return getSystem().actorOf(props, name); } @@ -126,17 +108,8 @@ public class ShardTransactionTest extends AbstractActorTest { } private void testOnReceiveReadData(final ActorRef transaction) { - //serialized read - transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), - getRef()); - - Object replySerialized = - expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); - - assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); - - // unserialized read - transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()),getRef()); + transaction.tell(new ReadData(YangInstanceIdentifier.builder().build(), + DataStoreVersions.CURRENT_VERSION),getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -157,16 +130,7 @@ public class ShardTransactionTest extends AbstractActorTest { } private void testOnReceiveReadDataWhenDataNotFound(final ActorRef transaction) { - // serialized read - transaction.tell(new ReadData(TestModel.TEST_PATH).toSerializable(), getRef()); - - Object replySerialized = - expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); - - assertTrue(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode() == null); - - // unserialized read - transaction.tell(new ReadData(TestModel.TEST_PATH),getRef()); + transaction.tell(new ReadData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION),getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -174,22 +138,6 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } - @Test - public void testOnReceiveReadDataHeliumR1() throws Exception { - new JavaTestKit(getSystem()) {{ - ActorRef transaction = newTransactionActor(RO, readOnlyTransaction(), - "testOnReceiveReadDataHeliumR1", DataStoreVersions.HELIUM_1_VERSION); - - transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), - getRef()); - - ShardTransactionMessages.ReadDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.ReadDataReply.class); - - assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); - }}; - } - @Test public void testOnReceiveDataExistsPositive() throws Exception { new JavaTestKit(getSystem()) {{ @@ -203,16 +151,8 @@ public class ShardTransactionTest extends AbstractActorTest { } private void testOnReceiveDataExistsPositive(final ActorRef transaction) { - transaction.tell(new DataExists(YangInstanceIdentifier.builder().build()).toSerializable(), - getRef()); - - ShardTransactionMessages.DataExistsReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DataExistsReply.class); - - assertTrue(DataExistsReply.fromSerializable(replySerialized).exists()); - - // unserialized read - transaction.tell(new DataExists(YangInstanceIdentifier.builder().build()),getRef()); + transaction.tell(new DataExists(YangInstanceIdentifier.builder().build(), + DataStoreVersions.CURRENT_VERSION),getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -233,15 +173,7 @@ public class ShardTransactionTest extends AbstractActorTest { } private void testOnReceiveDataExistsNegative(final ActorRef transaction) { - transaction.tell(new DataExists(TestModel.TEST_PATH).toSerializable(), getRef()); - - ShardTransactionMessages.DataExistsReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DataExistsReply.class); - - assertFalse(DataExistsReply.fromSerializable(replySerialized).exists()); - - // unserialized read - transaction.tell(new DataExists(TestModel.TEST_PATH),getRef()); + transaction.tell(new DataExists(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION),getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -249,102 +181,6 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } - @Test - public void testOnReceiveWriteData() { - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(WO, readWriteTransaction(), - "testOnReceiveWriteData"); - - transaction.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.HELIUM_2_VERSION). - toSerializable(), getRef()); - - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); - - // unserialized write - transaction.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.CURRENT_VERSION), - getRef()); - - expectMsgClass(duration("5 seconds"), WriteDataReply.class); - }}; - } - - @Test - public void testOnReceiveHeliumR1WriteData() { - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(WO, readWriteTransaction(), - "testOnReceiveHeliumR1WriteData", DataStoreVersions.HELIUM_1_VERSION); - - Encoded encoded = new NormalizedNodeToNodeCodec(null).encode(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - ShardTransactionMessages.WriteData serialized = ShardTransactionMessages.WriteData.newBuilder() - .setInstanceIdentifierPathArguments(encoded.getEncodedPath()) - .setNormalizedNode(encoded.getEncodedNode().getNormalizedNode()).build(); - - transaction.tell(serialized, getRef()); - - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); - }}; - } - - @Test - public void testOnReceiveMergeData() { - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(RW, readWriteTransaction(), - "testMergeData"); - - transaction.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.HELIUM_2_VERSION). - toSerializable(), getRef()); - - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); - - //unserialized merge - transaction.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.CURRENT_VERSION), - getRef()); - - expectMsgClass(duration("5 seconds"), MergeDataReply.class); - }}; - } - - @Test - public void testOnReceiveHeliumR1MergeData() throws Exception { - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(WO, readWriteTransaction(), - "testOnReceiveHeliumR1MergeData", DataStoreVersions.HELIUM_1_VERSION); - - Encoded encoded = new NormalizedNodeToNodeCodec(null).encode(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - ShardTransactionMessages.MergeData serialized = ShardTransactionMessages.MergeData.newBuilder() - .setInstanceIdentifierPathArguments(encoded.getEncodedPath()) - .setNormalizedNode(encoded.getEncodedNode().getNormalizedNode()).build(); - - transaction.tell(serialized, getRef()); - - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); - }}; - } - - @Test - public void testOnReceiveDeleteData() throws Exception { - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(WO, readWriteTransaction(), - "testDeleteData"); - - transaction.tell(new DeleteData(TestModel.TEST_PATH, DataStoreVersions.HELIUM_2_VERSION). - toSerializable(), getRef()); - - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DeleteDataReply.class); - - //unserialized - transaction.tell(new DeleteData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION), getRef()); - - expectMsgClass(duration("5 seconds"), DeleteDataReply.class); - }}; - } - @Test public void testOnReceiveBatchedModifications() throws Exception { new JavaTestKit(getSystem()) {{ @@ -436,7 +272,7 @@ public class ShardTransactionTest extends AbstractActorTest { batched.setTotalMessagesSent(1); transaction.tell(batched, getRef()); - expectMsgClass(duration("5 seconds"), CommitTransactionReply.SERIALIZABLE_CLASS); + expectMsgClass(duration("5 seconds"), CommitTransactionReply.class); watcher.expectMsgClass(duration("5 seconds"), Terminated.class); }}; } @@ -504,36 +340,6 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } - @Test - public void testOnReceivePreLithiumReadyTransaction() throws Exception { - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(RW, readWriteTransaction(), - "testReadyTransaction", DataStoreVersions.HELIUM_2_VERSION); - - JavaTestKit watcher = new JavaTestKit(getSystem()); - watcher.watch(transaction); - - transaction.tell(new ReadyTransaction().toSerializable(), getRef()); - - expectMsgClass(duration("5 seconds"), ReadyTransactionReply.SERIALIZABLE_CLASS); - watcher.expectMsgClass(duration("5 seconds"), Terminated.class); - }}; - - // test - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(RW, readWriteTransaction(), - "testReadyTransaction2", DataStoreVersions.HELIUM_2_VERSION); - - JavaTestKit watcher = new JavaTestKit(getSystem()); - watcher.watch(transaction); - - transaction.tell(new ReadyTransaction(), getRef()); - - expectMsgClass(duration("5 seconds"), ReadyTransactionReply.class); - watcher.expectMsgClass(duration("5 seconds"), Terminated.class); - }}; - } - @Test public void testOnReceiveCreateSnapshot() throws Exception { new JavaTestKit(getSystem()) {{ @@ -573,7 +379,7 @@ public class ShardTransactionTest extends AbstractActorTest { transaction.tell(new CloseTransaction().toSerializable(), getRef()); - expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); + expectMsgClass(duration("3 seconds"), CloseTransactionReply.class); expectTerminated(duration("3 seconds"), transaction); }}; } @@ -588,7 +394,7 @@ public class ShardTransactionTest extends AbstractActorTest { transaction.tell(new CloseTransaction().toSerializable(), getRef()); - expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); + expectMsgClass(duration("3 seconds"), CloseTransactionReply.class); expectTerminated(duration("3 seconds"), transaction); }}; } @@ -611,11 +417,11 @@ public class ShardTransactionTest extends AbstractActorTest { public void testNegativePerformingWriteOperationOnReadTransaction() throws Exception { final ActorRef shard = createShard(); final Props props = ShardTransaction.props(TransactionType.READ_ONLY, readOnlyTransaction(), shard, - datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); + datastoreContext, shardStats, "txn"); final TestActorRef transaction = TestActorRef.apply(props,getSystem()); - transaction.receive(new DeleteData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION). - toSerializable(), ActorRef.noSender()); + transaction.receive(new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null), + ActorRef.noSender()); } @Test @@ -634,6 +440,35 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } + @Test + public void testOnReceivePreBoronReadData() throws Exception { + new JavaTestKit(getSystem()) {{ + ActorRef transaction = newTransactionActor(RO, readOnlyTransaction(), createShard(), + "testOnReceivePreBoronReadData"); + + transaction.tell(new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.LITHIUM_VERSION). + toSerializable(), getRef()); + + Object replySerialized = expectMsgClass(duration("5 seconds"), ReadDataReply.class); + assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); + }}; + } + + @Test + public void testOnReceivePreBoronDataExists() throws Exception { + new JavaTestKit(getSystem()) {{ + ActorRef transaction = newTransactionActor(RO, readOnlyTransaction(), createShard(), + "testOnReceivePreBoronDataExists"); + + transaction.tell(new DataExists(YangInstanceIdentifier.EMPTY, DataStoreVersions.LITHIUM_VERSION). + toSerializable(), getRef()); + + Object replySerialized = expectMsgClass(duration("5 seconds"), + ShardTransactionMessages.DataExistsReply.class); + assertTrue(DataExistsReply.fromSerializable(replySerialized).exists()); + }}; + } + public static class TestException extends RuntimeException { private static final long serialVersionUID = 1L; }