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%2FShardTransactionFailureTest.java;h=3ecc8c9902d0a65fd02f7dfb144dd4d830322ea3;hp=e45389f5f36fbd151a24ae9e4d5a02a4995a2772;hb=80f668c77ef358ba5fbc53b0332597bd2c4844c2;hpb=dea515c8870769408b9bea29f555d6b71ff43211 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java index e45389f5f3..3ecc8c9902 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java @@ -1,32 +1,26 @@ /* + * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved. * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.controller.cluster.datastore; import akka.actor.ActorRef; import akka.actor.Props; -import akka.pattern.AskTimeoutException; import akka.testkit.TestActorRef; -import java.util.Collections; import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.opendaylight.controller.cluster.datastore.TransactionProxy.TransactionType; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; -import org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeSerializer; +import org.opendaylight.controller.cluster.datastore.messages.DataExists; +import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; -import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages; -import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import scala.concurrent.Await; import scala.concurrent.Future; @@ -44,7 +38,7 @@ public class ShardTransactionFailureTest extends AbstractActorTest { private static final TransactionType RW = TransactionType.READ_WRITE; private static final TransactionType WO = TransactionType.WRITE_ONLY; - private static final ShardDataTree store = new ShardDataTree(testSchemaContext); + private static final ShardDataTree store = new ShardDataTree(testSchemaContext, TreeType.OPERATIONAL); private static final ShardIdentifier SHARD_IDENTIFIER = ShardIdentifier.builder().memberName("member-1") @@ -55,224 +49,70 @@ public class ShardTransactionFailureTest extends AbstractActorTest { private final ShardStats shardStats = new ShardStats(SHARD_IDENTIFIER.toString(), "DataStore"); private ActorRef createShard(){ - return getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, Collections.emptyMap(), datastoreContext, - TestModel.createTestContext())); + ActorRef shard = getSystem().actorOf(Shard.builder().id(SHARD_IDENTIFIER).datastoreContext(datastoreContext). + schemaContext(TestModel.createTestContext()).props()); + ShardTestKit.waitUntilLeader(shard); + return shard; } @Test(expected = ReadFailedException.class) - public void testNegativeReadWithReadOnlyTransactionClosed() - throws Throwable { + public void testNegativeReadWithReadOnlyTransactionClosed() throws Throwable { final ActorRef shard = createShard(); final Props props = ShardTransaction.props(RO, store.newReadOnlyTransaction("test-txn", null), shard, datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); - final TestActorRef subject = TestActorRef - .create(getSystem(), props, + final TestActorRef subject = TestActorRef.create(getSystem(), props, "testNegativeReadWithReadOnlyTransactionClosed"); - ShardTransactionMessages.ReadData readData = - ShardTransactionMessages.ReadData.newBuilder() - .setInstanceIdentifierPathArguments( - NormalizedNodeMessages.InstanceIdentifier.newBuilder() - .build() - ).build(); - Future future = - akka.pattern.Patterns.ask(subject, readData, 3000); + Future future = akka.pattern.Patterns.ask(subject, + new ReadData(YangInstanceIdentifier.EMPTY), 3000); Await.result(future, Duration.create(3, TimeUnit.SECONDS)); subject.underlyingActor().getDOMStoreTransaction().abort(); - future = akka.pattern.Patterns.ask(subject, readData, 3000); + future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.EMPTY), 3000); Await.result(future, Duration.create(3, TimeUnit.SECONDS)); } @Test(expected = ReadFailedException.class) - public void testNegativeReadWithReadWriteTransactionClosed() - throws Throwable { + public void testNegativeReadWithReadWriteTransactionClosed() throws Throwable { final ActorRef shard = createShard(); final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction("test-txn", null), shard, datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); - final TestActorRef subject = TestActorRef - .create(getSystem(), props, + final TestActorRef subject = TestActorRef.create(getSystem(), props, "testNegativeReadWithReadWriteTransactionClosed"); - ShardTransactionMessages.ReadData readData = - ShardTransactionMessages.ReadData.newBuilder() - .setInstanceIdentifierPathArguments( - NormalizedNodeMessages.InstanceIdentifier.newBuilder() - .build() - ).build(); - - Future future = - akka.pattern.Patterns.ask(subject, readData, 3000); + Future future = akka.pattern.Patterns.ask(subject, + new ReadData(YangInstanceIdentifier.EMPTY), 3000); Await.result(future, Duration.create(3, TimeUnit.SECONDS)); subject.underlyingActor().getDOMStoreTransaction().abort(); - future = akka.pattern.Patterns.ask(subject, readData, 3000); + future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.EMPTY), 3000); Await.result(future, Duration.create(3, TimeUnit.SECONDS)); } @Test(expected = ReadFailedException.class) - public void testNegativeExistsWithReadWriteTransactionClosed() - throws Throwable { + public void testNegativeExistsWithReadWriteTransactionClosed() throws Throwable { final ActorRef shard = createShard(); final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction("test-txn", null), shard, datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); - final TestActorRef subject = TestActorRef - .create(getSystem(), props, + final TestActorRef subject = TestActorRef.create(getSystem(), props, "testNegativeExistsWithReadWriteTransactionClosed"); - ShardTransactionMessages.DataExists dataExists = - ShardTransactionMessages.DataExists.newBuilder() - .setInstanceIdentifierPathArguments( - NormalizedNodeMessages.InstanceIdentifier.newBuilder() - .build() - ).build(); - - Future future = - akka.pattern.Patterns.ask(subject, dataExists, 3000); + Future future = akka.pattern.Patterns.ask(subject, + new DataExists(YangInstanceIdentifier.EMPTY), 3000); Await.result(future, Duration.create(3, TimeUnit.SECONDS)); subject.underlyingActor().getDOMStoreTransaction().abort(); - future = akka.pattern.Patterns.ask(subject, dataExists, 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - } - - @Test(expected = AskTimeoutException.class) - public void testNegativeWriteWithTransactionReady() throws Exception { - - - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(WO, store.newReadWriteTransaction("test-txn", null), shard, - datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); - - final TestActorRef subject = TestActorRef - .create(getSystem(), props, - "testNegativeWriteWithTransactionReady"); - - ShardTransactionMessages.ReadyTransaction readyTransaction = - ShardTransactionMessages.ReadyTransaction.newBuilder().build(); - - Future future = - akka.pattern.Patterns.ask(subject, readyTransaction, 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - - ShardTransactionMessages.WriteData writeData = - ShardTransactionMessages.WriteData.newBuilder() - .setInstanceIdentifierPathArguments( - NormalizedNodeMessages.InstanceIdentifier.newBuilder() - .build()).setNormalizedNode( - buildNormalizedNode() - - ).build(); - - future = akka.pattern.Patterns.ask(subject, writeData, 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - } - - @Test(expected = AskTimeoutException.class) - public void testNegativeReadWriteWithTransactionReady() throws Exception { - - - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction("test-txn", null), shard, - datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); - - final TestActorRef subject = TestActorRef - .create(getSystem(), props, - "testNegativeReadWriteWithTransactionReady"); - - ShardTransactionMessages.ReadyTransaction readyTransaction = - ShardTransactionMessages.ReadyTransaction.newBuilder().build(); - - Future future = - akka.pattern.Patterns.ask(subject, readyTransaction, 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - - ShardTransactionMessages.WriteData writeData = - ShardTransactionMessages.WriteData.newBuilder() - .setInstanceIdentifierPathArguments( - NormalizedNodeMessages.InstanceIdentifier.newBuilder() - .build() - ) - .setNormalizedNode(buildNormalizedNode()) - .build(); - - future = akka.pattern.Patterns.ask(subject, writeData, 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - } - - private NormalizedNodeMessages.Node buildNormalizedNode() { - return NormalizedNodeSerializer - .serialize(Builders.containerBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).build()); - } - - @Test(expected = AskTimeoutException.class) - public void testNegativeMergeTransactionReady() throws Exception { - - - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction("test-txn", null), shard, - datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); - - final TestActorRef subject = TestActorRef - .create(getSystem(), props, "testNegativeMergeTransactionReady"); - - ShardTransactionMessages.ReadyTransaction readyTransaction = - ShardTransactionMessages.ReadyTransaction.newBuilder().build(); - - Future future = - akka.pattern.Patterns.ask(subject, readyTransaction, 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - - ShardTransactionMessages.MergeData mergeData = - ShardTransactionMessages.MergeData.newBuilder() - .setInstanceIdentifierPathArguments( - NormalizedNodeMessages.InstanceIdentifier.newBuilder() - .build()).setNormalizedNode( - buildNormalizedNode() - - ).build(); - - future = akka.pattern.Patterns.ask(subject, mergeData, 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - } - - - @Test(expected = AskTimeoutException.class) - public void testNegativeDeleteDataWhenTransactionReady() throws Exception { - - - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction("test-txn", null), shard, - datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); - - final TestActorRef subject = TestActorRef - .create(getSystem(), props, - "testNegativeDeleteDataWhenTransactionReady"); - - ShardTransactionMessages.ReadyTransaction readyTransaction = - ShardTransactionMessages.ReadyTransaction.newBuilder().build(); - - Future future = - akka.pattern.Patterns.ask(subject, readyTransaction, 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - - ShardTransactionMessages.DeleteData deleteData = - ShardTransactionMessages.DeleteData.newBuilder() - .setInstanceIdentifierPathArguments( - NormalizedNodeMessages.InstanceIdentifier.newBuilder() - .build()).build(); - - future = akka.pattern.Patterns.ask(subject, deleteData, 3000); + future = akka.pattern.Patterns.ask(subject, new DataExists(YangInstanceIdentifier.EMPTY), 3000); Await.result(future, Duration.create(3, TimeUnit.SECONDS)); } }