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=0cb9046a65289fee6bcbb850acc47ab5f7b63fff;hp=e0c9ace76001ee289c8ae4266590fd7088bb5f45;hb=4d1709660b7af992d4c382a2a38debb5c7d64fb9;hpb=b124e8216055ee30a87207c8b8a95e5c9661f291 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 e0c9ace760..0cb9046a65 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 @@ -20,9 +20,11 @@ import akka.actor.Terminated; import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; import java.util.concurrent.TimeUnit; +import org.junit.Ignore; import org.junit.Test; import org.mockito.InOrder; import org.mockito.Mockito; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.exceptions.UnknownMessageException; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; @@ -43,7 +45,6 @@ import org.opendaylight.controller.cluster.datastore.modification.WriteModificat 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; -import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -61,8 +62,8 @@ public class ShardTransactionTest extends AbstractActorTest { private static final TransactionType WO = TransactionType.WRITE_ONLY; private static final ShardIdentifier SHARD_IDENTIFIER = - ShardIdentifier.builder().memberName("member-1") - .shardName("inventory").type("config").build(); + ShardIdentifier.create("inventory", MEMBER_NAME, "config"); + private DatastoreContext datastoreContext = DatastoreContext.newBuilder().build(); @@ -70,8 +71,6 @@ public class ShardTransactionTest extends AbstractActorTest { private final ShardDataTree store = new ShardDataTree(testSchemaContext, TreeType.OPERATIONAL); - private int txCounter = 0; - private ActorRef createShard() { ActorRef shard = getSystem().actorOf(Shard.builder().id(SHARD_IDENTIFIER).datastoreContext(datastoreContext). schemaContext(TestModel.createTestContext()).props()); @@ -85,16 +84,16 @@ public class ShardTransactionTest extends AbstractActorTest { private ActorRef newTransactionActor(TransactionType type, AbstractShardDataTreeTransaction transaction, ActorRef shard, String name) { Props props = ShardTransaction.props(type, transaction, shard != null ? shard : createShard(), - datastoreContext, shardStats, "txn"); + datastoreContext, shardStats); return getSystem().actorOf(props, name); } private ReadOnlyShardDataTreeTransaction readOnlyTransaction() { - return store.newReadOnlyTransaction("test-ro-" + String.valueOf(txCounter++), null); + return store.newReadOnlyTransaction(nextTransactionId()); } private ReadWriteShardDataTreeTransaction readWriteTransaction() { - return store.newReadWriteTransaction("test-rw-" + String.valueOf(txCounter++), null); + return store.newReadWriteTransaction(nextTransactionId()); } @Test @@ -108,8 +107,8 @@ public class ShardTransactionTest extends AbstractActorTest { } private void testOnReceiveReadData(final ActorRef transaction) { - transaction.tell(new ReadData(YangInstanceIdentifier.builder().build(), - DataStoreVersions.CURRENT_VERSION),getRef()); + transaction.tell(new ReadData(YangInstanceIdentifier.EMPTY, + DataStoreVersions.CURRENT_VERSION), getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -151,8 +150,8 @@ public class ShardTransactionTest extends AbstractActorTest { } private void testOnReceiveDataExistsPositive(final ActorRef transaction) { - transaction.tell(new DataExists(YangInstanceIdentifier.builder().build(), - DataStoreVersions.CURRENT_VERSION),getRef()); + transaction.tell(new DataExists(YangInstanceIdentifier.EMPTY, + DataStoreVersions.CURRENT_VERSION), getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -187,7 +186,8 @@ public class ShardTransactionTest extends AbstractActorTest { ShardDataTreeTransactionParent parent = Mockito.mock(ShardDataTreeTransactionParent.class); DataTreeModification mockModification = Mockito.mock(DataTreeModification.class); - ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent, "id", mockModification); + ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent, + nextTransactionId(), mockModification); final ActorRef transaction = newTransactionActor(RW, mockWriteTx, "testOnReceiveBatchedModifications"); YangInstanceIdentifier writePath = TestModel.TEST_PATH; @@ -201,7 +201,7 @@ public class ShardTransactionTest extends AbstractActorTest { YangInstanceIdentifier deletePath = TestModel.TEST_PATH; - BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); + BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION); batched.addModification(new WriteModification(writePath, writeData)); batched.addModification(new MergeModification(mergePath, mergeData)); batched.addModification(new DeleteModification(deletePath)); @@ -233,14 +233,15 @@ public class ShardTransactionTest extends AbstractActorTest { new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); - BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); + final TransactionIdentifier tx1 = nextTransactionId(); + BatchedModifications batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION); batched.addModification(new WriteModification(writePath, writeData)); transaction.tell(batched, getRef()); BatchedModificationsReply reply = expectMsgClass(duration("5 seconds"), BatchedModificationsReply.class); assertEquals("getNumBatched", 1, reply.getNumBatched()); - batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); + batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION); batched.setReady(true); batched.setTotalMessagesSent(2); @@ -265,7 +266,7 @@ public class ShardTransactionTest extends AbstractActorTest { new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); - BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); + BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION); batched.addModification(new WriteModification(writePath, writeData)); batched.setReady(true); batched.setDoCommitOnReady(true); @@ -283,7 +284,8 @@ public class ShardTransactionTest extends AbstractActorTest { ShardDataTreeTransactionParent parent = Mockito.mock(ShardDataTreeTransactionParent.class); DataTreeModification mockModification = Mockito.mock(DataTreeModification.class); - ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent, "id", mockModification); + ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent, + nextTransactionId(), mockModification); final ActorRef transaction = newTransactionActor(RW, mockWriteTx, "testOnReceiveBatchedModificationsFailure"); @@ -295,13 +297,14 @@ public class ShardTransactionTest extends AbstractActorTest { doThrow(new TestException()).when(mockModification).write(path, node); - BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); + final TransactionIdentifier tx1 = nextTransactionId(); + BatchedModifications batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION); batched.addModification(new WriteModification(path, node)); transaction.tell(batched, getRef()); expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); - batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); + batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION); batched.setReady(true); batched.setTotalMessagesSent(2); @@ -325,7 +328,7 @@ public class ShardTransactionTest extends AbstractActorTest { JavaTestKit watcher = new JavaTestKit(getSystem()); watcher.watch(transaction); - BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); + BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION); batched.setReady(true); batched.setTotalMessagesSent(2); @@ -347,7 +350,7 @@ public class ShardTransactionTest extends AbstractActorTest { ImmutableNodes.containerNode(TestModel.TEST_QNAME)); NormalizedNode expectedRoot = ShardTest.readStore(store.getDataTree(), - YangInstanceIdentifier.builder().build()); + YangInstanceIdentifier.EMPTY); final ActorRef transaction = newTransactionActor(TransactionType.READ_ONLY, readOnlyTransaction(), "testOnReceiveCreateSnapshot"); @@ -413,14 +416,16 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } + // Unknown operations are being logged + @Ignore @Test(expected=UnknownMessageException.class) public void testNegativePerformingWriteOperationOnReadTransaction() throws Exception { final ActorRef shard = createShard(); final Props props = ShardTransaction.props(TransactionType.READ_ONLY, readOnlyTransaction(), shard, - datastoreContext, shardStats, "txn"); + datastoreContext, shardStats); final TestActorRef transaction = TestActorRef.apply(props,getSystem()); - transaction.receive(new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null), + transaction.receive(new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION), ActorRef.noSender()); } @@ -439,36 +444,6 @@ public class ShardTransactionTest extends AbstractActorTest { expectMsgClass(duration("3 seconds"), Terminated.class); }}; } - - @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; }