X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fentityownership%2FDistributedEntityOwnershipIntegrationTest.java;h=ad80b86e02ac5186baa8c472c75063c204223a4c;hb=c4b4b98f56ab1d9821edb737912632c2867ae783;hp=9bdacd73f544e6cc7812c690847e8d42ce9d6773;hpb=e9fc7e7ed2b13d274518d6a872ab67749ef4507a;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java index 9bdacd73f5..ad80b86e02 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java @@ -29,7 +29,6 @@ import akka.actor.Status.Success; import akka.cluster.Cluster; import akka.pattern.Patterns; import akka.util.Timeout; -import com.google.common.base.Optional; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -39,6 +38,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; @@ -129,7 +129,7 @@ public class DistributedEntityOwnershipIntegrationTest { } private static DistributedEntityOwnershipService newOwnershipService(final AbstractDataStore datastore) { - return DistributedEntityOwnershipService.start(datastore.getActorContext(), + return DistributedEntityOwnershipService.start(datastore.getActorUtils(), EntityOwnerSelectionStrategyConfig.newBuilder().build()); } @@ -160,7 +160,7 @@ public class DistributedEntityOwnershipIntegrationTest { final DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); leaderEntityOwnershipService.registerListener(ENTITY_TYPE1, leaderMockListener); leaderEntityOwnershipService.registerListener(ENTITY_TYPE2, leaderMockListener2); @@ -305,7 +305,7 @@ public class DistributedEntityOwnershipIntegrationTest { final DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Register follower1 candidate for entity1 and verify it becomes owner @@ -331,12 +331,12 @@ public class DistributedEntityOwnershipIntegrationTest { // Re-enable elections on all remaining followers so one becomes the new leader - ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(), + ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(), + ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); @@ -406,7 +406,7 @@ public class DistributedEntityOwnershipIntegrationTest { newOwnershipService(follower3Node.configDataStore()); newOwnershipService(follower4Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Register follower1 candidate for entity1 and verify it becomes owner @@ -438,17 +438,17 @@ public class DistributedEntityOwnershipIntegrationTest { // Re-enable elections on all remaining followers so one becomes the new leader - ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(), + ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(), + ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - ActorRef follower4Shard = IntegrationTestKit.findLocalShard(follower4Node.configDataStore().getActorContext(), + ActorRef follower4Shard = IntegrationTestKit.findLocalShard(follower4Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower4Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); @@ -503,7 +503,7 @@ public class DistributedEntityOwnershipIntegrationTest { final DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); leaderEntityOwnershipService.registerListener(ENTITY_TYPE1, leaderMockListener); follower1EntityOwnershipService.registerListener(ENTITY_TYPE1, follower1MockListener); @@ -564,10 +564,10 @@ public class DistributedEntityOwnershipIntegrationTest { private static Optional getValueSafely(ArgumentCaptor captor) { try { - return Optional.fromNullable(captor.getValue()); + return Optional.ofNullable(captor.getValue()); } catch (MockitoException e) { // No value was captured - return Optional.absent(); + return Optional.empty(); } } @@ -587,7 +587,7 @@ public class DistributedEntityOwnershipIntegrationTest { AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) .moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) @@ -611,7 +611,7 @@ public class DistributedEntityOwnershipIntegrationTest { // Add replica in follower1 AddShardReplica addReplica = new AddShardReplica(ENTITY_OWNERSHIP_SHARD_NAME); - follower1DistributedDataStore.getActorContext().getShardManager().tell(addReplica, + follower1DistributedDataStore.getActorUtils().getShardManager().tell(addReplica, follower1Node.kit().getRef()); Object reply = follower1Node.kit().expectMsgAnyClassOf(follower1Node.kit().duration("5 sec"), Success.class, Failure.class); @@ -673,7 +673,7 @@ public class DistributedEntityOwnershipIntegrationTest { newOwnershipService(follower1Node.configDataStore()); newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Register leader candidate for entity1 and verify it becomes owner @@ -716,7 +716,7 @@ public class DistributedEntityOwnershipIntegrationTest { newOwnershipService(follower1Node.configDataStore()); newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Register leader candidate for entity1 and verify it becomes owner @@ -782,14 +782,15 @@ public class DistributedEntityOwnershipIntegrationTest { newOwnershipService(member5FollowerNode.configDataStore()); newOwnershipService(member1LeaderNode.configDataStore()); - member1LeaderNode.kit().waitUntilLeader(member1LeaderNode.configDataStore().getActorContext(), + member1LeaderNode.kit().waitUntilLeader(member1LeaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Make member4 and member5 non-voting - Future future = Patterns.ask(leaderDistributedDataStore.getActorContext().getShardManager(), + Future future = Patterns.ask(leaderDistributedDataStore.getActorUtils().getShardManager(), new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME, - ImmutableMap.of("member-4", false, "member-5", false)), new Timeout(10, TimeUnit.SECONDS)); + ImmutableMap.of("member-4", Boolean.FALSE, "member-5", Boolean.FALSE)), + new Timeout(10, TimeUnit.SECONDS)); Object response = Await.result(future, FiniteDuration.apply(10, TimeUnit.SECONDS)); if (response instanceof Throwable) { throw new AssertionError("ChangeShardMembersVotingStatus failed", (Throwable)response); @@ -820,9 +821,9 @@ public class DistributedEntityOwnershipIntegrationTest { // Switch member4 and member5 back to voting and member3 non-voting. This should result in member4 and member5 // to become entity owners. - future = Patterns.ask(leaderDistributedDataStore.getActorContext().getShardManager(), + future = Patterns.ask(leaderDistributedDataStore.getActorUtils().getShardManager(), new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME, - ImmutableMap.of("member-3", false, "member-4", true, "member-5", true)), + ImmutableMap.of("member-3", Boolean.FALSE, "member-4", Boolean.TRUE, "member-5", Boolean.TRUE)), new Timeout(10, TimeUnit.SECONDS)); response = Await.result(future, FiniteDuration.apply(10, TimeUnit.SECONDS)); if (response instanceof Throwable) { @@ -838,7 +839,7 @@ public class DistributedEntityOwnershipIntegrationTest { private static void verifyGetOwnershipState(final DOMEntityOwnershipService service, final DOMEntity entity, final EntityOwnershipState expState) { Optional state = service.getOwnershipState(entity); - assertEquals("getOwnershipState present", true, state.isPresent()); + assertTrue("getOwnershipState present", state.isPresent()); assertEquals("EntityOwnershipState", expState, state.get()); } @@ -851,7 +852,7 @@ public class DistributedEntityOwnershipIntegrationTest { .read(entityPath(entity.getType(), entity.getIdentifier()).node(Candidate.QNAME)) .get(5, TimeUnit.SECONDS); try { - assertEquals("Candidates not found for " + entity, true, possible.isPresent()); + assertTrue("Candidates not found for " + entity, possible.isPresent()); Collection actual = new ArrayList<>(); for (MapEntryNode candidate: ((MapNode)possible.get()).getValue()) { actual.add(candidate.getChild(CANDIDATE_NAME_NODE_ID).get().getValue().toString());