X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fregistry%2FRpcRegistryTest.java;h=e0d145dbe179b4af06109f1df28151b066b50cd8;hp=ab609413dd82731466495365d0c46f28731fcdc0;hb=191ad68d71f30f6ad6258ac458c60c663e5b1b85;hpb=08d30cebbbec8da5596840c6ef830687a76d9d33 diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java index ab609413dd..e0d145dbe1 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java @@ -6,32 +6,36 @@ import akka.actor.ActorSelection; import akka.actor.ActorSystem; import akka.actor.ChildActorPath; import akka.actor.Props; -import akka.japi.Pair; +import akka.pattern.Patterns; import akka.testkit.JavaTestKit; -import com.typesafe.config.ConfigFactory; +import akka.util.Timeout; +import com.google.common.base.Predicate; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import javax.annotation.Nullable; import org.junit.After; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.opendaylight.controller.remote.rpc.RemoteRpcProviderConfig; import org.opendaylight.controller.remote.rpc.RouteIdentifierImpl; +import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.AddOrUpdateRoutes; +import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.RemoveRoutes; +import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.SetLocalRouter; +import org.opendaylight.controller.remote.rpc.registry.gossip.Messages; import org.opendaylight.controller.sal.connector.api.RpcRouter; +import org.opendaylight.controller.utils.ConditionalProbe; import org.opendaylight.yangtools.yang.common.QName; import scala.concurrent.Await; import scala.concurrent.Future; +import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.AddOrUpdateRoute; -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.FindRouters; -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.FindRoutersReply; -import static org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.SetLocalRouter; - public class RpcRegistryTest { private static ActorSystem node1; @@ -43,206 +47,203 @@ public class RpcRegistryTest { private ActorRef registry3; @BeforeClass - public static void setup() throws InterruptedException { - Thread.sleep(1000); //give some time for previous test to close netty ports - node1 = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("memberA")); - node2 = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("memberB")); - node3 = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("memberC")); + public static void staticSetup() throws InterruptedException { + RemoteRpcProviderConfig config1 = new RemoteRpcProviderConfig.Builder("memberA").build(); + RemoteRpcProviderConfig config2 = new RemoteRpcProviderConfig.Builder("memberB").build(); + RemoteRpcProviderConfig config3 = new RemoteRpcProviderConfig.Builder("memberC").build(); + node1 = ActorSystem.create("opendaylight-rpc", config1.get()); + node2 = ActorSystem.create("opendaylight-rpc", config2.get()); + node3 = ActorSystem.create("opendaylight-rpc", config3.get()); } @AfterClass - public static void teardown(){ - JavaTestKit.shutdownActorSystem(node1); - JavaTestKit.shutdownActorSystem(node2); - JavaTestKit.shutdownActorSystem(node3); - if (node1 != null) - node1.shutdown(); - if (node2 != null) - node2.shutdown(); - if (node3 != null) - node3.shutdown(); - + public static void staticTeardown() { + JavaTestKit.shutdownActorSystem(node1); + JavaTestKit.shutdownActorSystem(node2); + JavaTestKit.shutdownActorSystem(node3); } @Before - public void createRpcRegistry() throws InterruptedException { + public void setup() { registry1 = node1.actorOf(Props.create(RpcRegistry.class)); registry2 = node2.actorOf(Props.create(RpcRegistry.class)); registry3 = node3.actorOf(Props.create(RpcRegistry.class)); } @After - public void stopRpcRegistry() throws InterruptedException { - if (registry1 != null) + public void teardown() { + if (registry1 != null) { node1.stop(registry1); - if (registry2 != null) + } + if (registry2 != null) { node2.stop(registry2); - if (registry3 != null) + } + if (registry3 != null) { node3.stop(registry3); + } } /** - * One node cluster. - * Register rpc. Ensure router can be found + * One node cluster. 1. Register rpc, ensure router can be found 2. Then remove rpc, ensure its + * deleted * * @throws URISyntaxException * @throws InterruptedException */ @Test - public void testWhenRpcAddedOneNodeShouldAppearOnSameNode() throws URISyntaxException, InterruptedException { + public void testAddRemoveRpcOnSameNode() throws Exception { + + System.out.println("testAddRemoveRpcOnSameNode starting"); final JavaTestKit mockBroker = new JavaTestKit(node1); - //Add rpc on node 1 + final ActorPath bucketStorePath = new ChildActorPath(registry1.path(), "store"); + + // Add rpc on node 1 registry1.tell(new SetLocalRouter(mockBroker.getRef()), mockBroker.getRef()); + + // install probe + final JavaTestKit probe1 = createProbeForMessage(node1, bucketStorePath, + Messages.BucketStoreMessages.UpdateBucket.class); + registry1.tell(getAddRouteMessage(), mockBroker.getRef()); - Thread.sleep(1000);// + // Bucket store should get an update bucket message. Updated bucket contains added rpc. + probe1.expectMsgClass(FiniteDuration.apply(10, TimeUnit.SECONDS), + Messages.BucketStoreMessages.UpdateBucket.class); - //find the route on node 1's registry - registry1.tell(new FindRouters(createRouteId()), mockBroker.getRef()); - FindRoutersReply message = mockBroker.expectMsgClass(JavaTestKit.duration("10 second"), FindRoutersReply.class); - List> pairs = message.getRouterWithUpdateTime(); + // Now remove rpc + registry1.tell(getRemoveRouteMessage(), mockBroker.getRef()); + + // Bucket store should get an update bucket message. Rpc is removed in the updated bucket + probe1.expectMsgClass(FiniteDuration.apply(10, TimeUnit.SECONDS), + Messages.BucketStoreMessages.UpdateBucket.class); + + System.out.println("testAddRemoveRpcOnSameNode ending"); - validateRouterReceived(pairs, mockBroker.getRef()); } /** - * Three node cluster. - * Register rpc on 1 node. Ensure its router can be found on other 2. + * Three node cluster. 1. Register rpc on 1 node, ensure 2nd node gets updated 2. Remove rpc on + * 1 node, ensure 2nd node gets updated * * @throws URISyntaxException * @throws InterruptedException */ @Test - public void testWhenRpcAddedOneNodeShouldAppearOnAnother() throws URISyntaxException, InterruptedException { + public void testRpcAddRemoveInCluster() throws Exception { - validateSystemStartup(); + System.out.println("testRpcAddRemoveInCluster starting"); final JavaTestKit mockBroker1 = new JavaTestKit(node1); - final JavaTestKit mockBroker2 = new JavaTestKit(node2); - final JavaTestKit mockBroker3 = new JavaTestKit(node3); - //Add rpc on node 1 + // install probe on node2's bucket store + final ActorPath bucketStorePath = new ChildActorPath(registry2.path(), "store"); + final JavaTestKit probe2 = createProbeForMessage(node2, bucketStorePath, + Messages.BucketStoreMessages.UpdateRemoteBuckets.class); + + // Add rpc on node 1 registry1.tell(new SetLocalRouter(mockBroker1.getRef()), mockBroker1.getRef()); registry1.tell(getAddRouteMessage(), mockBroker1.getRef()); - Thread.sleep(5000);// give some time for bucket store data sync - - //find the route in node 2's registry - registry2.tell(new FindRouters(createRouteId()), mockBroker2.getRef()); - FindRoutersReply message = mockBroker2.expectMsgClass(JavaTestKit.duration("10 second"), FindRoutersReply.class); - List> pairs = message.getRouterWithUpdateTime(); + // Bucket store on node2 should get a message to update its local copy of remote buckets + probe2.expectMsgClass(FiniteDuration.apply(10, TimeUnit.SECONDS), + Messages.BucketStoreMessages.UpdateRemoteBuckets.class); - validateRouterReceived(pairs, mockBroker1.getRef()); + // Now remove + registry1.tell(getRemoveRouteMessage(), mockBroker1.getRef()); - //find the route in node 3's registry - registry3.tell(new FindRouters(createRouteId()), mockBroker3.getRef()); - message = mockBroker3.expectMsgClass(JavaTestKit.duration("10 second"), FindRoutersReply.class); - pairs = message.getRouterWithUpdateTime(); - - validateRouterReceived(pairs, mockBroker1.getRef()); + // Bucket store on node2 should get a message to update its local copy of remote buckets + probe2.expectMsgClass(FiniteDuration.apply(10, TimeUnit.SECONDS), + Messages.BucketStoreMessages.UpdateRemoteBuckets.class); + System.out.println("testRpcAddRemoveInCluster ending"); } /** - * Three node cluster. - * Register rpc on 2 nodes. Ensure 2 routers are found on 3rd. + * Three node cluster. Register rpc on 2 nodes. Ensure 3rd gets updated. * * @throws Exception */ @Test - public void testAnRpcAddedOnMultiNodesShouldReturnMultiRouter() throws Exception { - - validateSystemStartup(); + public void testRpcAddedOnMultiNodes() throws Exception { final JavaTestKit mockBroker1 = new JavaTestKit(node1); final JavaTestKit mockBroker2 = new JavaTestKit(node2); final JavaTestKit mockBroker3 = new JavaTestKit(node3); - //Thread.sleep(5000);//let system come up + registry3.tell(new SetLocalRouter(mockBroker3.getRef()), mockBroker3.getRef()); - //Add rpc on node 1 + // install probe on node 3 + final ActorPath bucketStorePath = new ChildActorPath(registry3.path(), "store"); + final JavaTestKit probe3 = createProbeForMessage(node3, bucketStorePath, + Messages.BucketStoreMessages.UpdateRemoteBuckets.class); + + // Add rpc on node 1 registry1.tell(new SetLocalRouter(mockBroker1.getRef()), mockBroker1.getRef()); registry1.tell(getAddRouteMessage(), mockBroker1.getRef()); - //Add same rpc on node 2 + probe3.expectMsgClass(FiniteDuration.apply(10, TimeUnit.SECONDS), + Messages.BucketStoreMessages.UpdateRemoteBuckets.class); + + // Add same rpc on node 2 registry2.tell(new SetLocalRouter(mockBroker2.getRef()), mockBroker2.getRef()); registry2.tell(getAddRouteMessage(), mockBroker2.getRef()); - registry3.tell(new SetLocalRouter(mockBroker3.getRef()), mockBroker3.getRef()); - Thread.sleep(5000);// give some time for bucket store data sync - - //find the route in node 3's registry - registry3.tell(new FindRouters(createRouteId()), mockBroker3.getRef()); - FindRoutersReply message = mockBroker3.expectMsgClass(JavaTestKit.duration("10 second"), FindRoutersReply.class); - List> pairs = message.getRouterWithUpdateTime(); - - validateMultiRouterReceived(pairs, mockBroker1.getRef(), mockBroker2.getRef()); - + probe3.expectMsgClass(FiniteDuration.apply(10, TimeUnit.SECONDS), + Messages.BucketStoreMessages.UpdateRemoteBuckets.class); } - private void validateMultiRouterReceived(List> actual, ActorRef... expected) { - Assert.assertTrue(actual != null); - Assert.assertTrue(actual.size() == expected.length); - } - - private void validateRouterReceived(List> actual, ActorRef expected){ - Assert.assertTrue(actual != null); - Assert.assertTrue(actual.size() == 1); - - for (Pair pair : actual){ - Assert.assertTrue(expected.path().uid() == pair.first().path().uid()); + private JavaTestKit createProbeForMessage(ActorSystem node, ActorPath subjectPath, final Class clazz) + throws Exception { + final JavaTestKit probe = new JavaTestKit(node); + + ConditionalProbe conditionalProbe = new ConditionalProbe(probe.getRef(), new Predicate() { + @Override + public boolean apply(@Nullable Object input) { + if (input != null) { + return clazz.equals(input.getClass()); + } else { + return false; + } + } + }); + + FiniteDuration duration = Duration.create(3, TimeUnit.SECONDS); + Timeout timeout = new Timeout(duration); + int maxTries = 30; + int i = 0; + while(true) { + ActorSelection subject = node.actorSelection(subjectPath); + Future future = Patterns.ask(subject, conditionalProbe, timeout); + + try { + Await.ready(future, duration); + break; + } catch (TimeoutException | InterruptedException e) { + if(++i > maxTries) { + throw e; + } + } } - } - - private void validateSystemStartup() throws InterruptedException { - - Thread.sleep(5000); - ActorPath gossiper1Path = new ChildActorPath(new ChildActorPath(registry1.path(), "store"), "gossiper"); - ActorPath gossiper2Path = new ChildActorPath(new ChildActorPath(registry2.path(), "store"), "gossiper"); - ActorPath gossiper3Path = new ChildActorPath(new ChildActorPath(registry3.path(), "store"), "gossiper"); - - ActorSelection gossiper1 = node1.actorSelection(gossiper1Path); - ActorSelection gossiper2 = node2.actorSelection(gossiper2Path); - ActorSelection gossiper3 = node3.actorSelection(gossiper3Path); + return probe; - if (!resolveReference(gossiper1, gossiper2, gossiper3)) - Assert.fail("Could not find gossipers"); } - private Boolean resolveReference(ActorSelection... gossipers) throws InterruptedException { - - Boolean resolved = true; - - for (int i=0; i< 5; i++) { - Thread.sleep(1000); - for (ActorSelection gossiper : gossipers) { - Future future = gossiper.resolveOne(new FiniteDuration(5000, TimeUnit.MILLISECONDS)); - - ActorRef ref = null; - try { - ref = Await.result(future, new FiniteDuration(10000, TimeUnit.MILLISECONDS)); - } catch (Exception e) { - e.printStackTrace(); - } - - if (ref == null) - resolved = false; - } - - if (resolved) break; - } - return resolved; + private AddOrUpdateRoutes getAddRouteMessage() throws URISyntaxException { + return new AddOrUpdateRoutes(createRouteIds()); } - private AddOrUpdateRoute getAddRouteMessage() throws URISyntaxException { - return new AddOrUpdateRoute(createRouteId()); + private RemoveRoutes getRemoveRouteMessage() throws URISyntaxException { + return new RemoveRoutes(createRouteIds()); } - private RpcRouter.RouteIdentifier createRouteId() throws URISyntaxException { + private List> createRouteIds() throws URISyntaxException { QName type = new QName(new URI("/mockrpc"), "mockrpc"); - return new RouteIdentifierImpl(null, type, null); + List> routeIds = new ArrayList<>(); + routeIds.add(new RouteIdentifierImpl(null, type, null)); + return routeIds; } -} \ No newline at end of file + +}