X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-dom-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Ftest%2Fconnect%2Fdom%2FCrossBrokerRpcTest.java;h=eb5cf21260b50a082c0fa2865cafb6f37e9b0581;hp=83c2f88376239a29bd0bf09060dc981fff2a1f65;hb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;hpb=d55de2cfa7bc8fe6c85d091a46f08219972b88d2 diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerRpcTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerRpcTest.java index 83c2f88376..eb5cf21260 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerRpcTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerRpcTest.java @@ -10,20 +10,32 @@ package org.opendaylight.controller.sal.binding.test.connect.dom; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; +import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.controller.sal.binding.test.util.BindingBrokerTestFactory; import org.opendaylight.controller.sal.binding.test.util.BindingTestContext; -import org.opendaylight.controller.sal.core.api.RpcImplementation; -import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry; +import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcProviderServiceAdapter; +import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.KnockKnockInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.KnockKnockInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.KnockKnockOutput; @@ -38,18 +50,15 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl; -import java.util.Collections; -import java.util.Set; -import java.util.concurrent.Future; +import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; public class CrossBrokerRpcTest { protected RpcProviderRegistry providerRegistry; - protected RpcProvisionRegistry provisionRegistry; + protected DOMRpcProviderService provisionRegistry; private BindingTestContext testContext; - private RpcImplementation biRpcInvoker; + private DOMRpcService biRpcInvoker; private MessageCapturingFlowService knockService; public static final TopLevelListKey NODE_A = new TopLevelListKey("a"); @@ -58,22 +67,25 @@ public class CrossBrokerRpcTest { private static final QName NODE_ID_QNAME = QName.create(TopLevelList.QNAME, "name"); private static final QName KNOCK_KNOCK_QNAME = QName.create(KnockKnockOutput.QNAME, "knock-knock"); + private static final SchemaPath KNOCK_KNOCK_PATH = SchemaPath.create(true, KNOCK_KNOCK_QNAME); public static final InstanceIdentifier NODES_PATH = InstanceIdentifier.builder(Top.class).build(); public static final InstanceIdentifier BA_NODE_A_ID = NODES_PATH.child(TopLevelList.class, NODE_A); public static final InstanceIdentifier BA_NODE_B_ID = NODES_PATH.child(TopLevelList.class, NODE_B); public static final InstanceIdentifier BA_NODE_C_ID = NODES_PATH.child(TopLevelList.class, NODE_C); - public static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier BI_NODE_C_ID = createBINodeIdentifier(NODE_C); + public static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier BI_NODE_C_ID = + createBINodeIdentifier(NODE_C); @Before - public void setup() { + public void setup() throws Exception { BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); - testFactory.setExecutor(MoreExecutors.sameThreadExecutor()); - testFactory.setStartWithParsedSchema(true); + testFactory.setExecutor(MoreExecutors.newDirectExecutorService()); testContext = testFactory.getTestContext(); + testContext.setSchemaModuleInfos(ImmutableSet.of( + BindingReflections.getModuleInfo(OpendaylightOfMigrationTestModelService.class))); testContext.start(); providerRegistry = testContext.getBindingRpcRegistry(); provisionRegistry = testContext.getDomRpcRegistry(); @@ -85,6 +97,58 @@ public class CrossBrokerRpcTest { } + @After + public void teardown() { + testContext.close(); + } + + @Test + public void testBindingRpcShortcutRegisteredViaLegacyAPI() + throws InterruptedException, ExecutionException, TimeoutException { + final ListenableFuture> knockResult = knockResult(true, "open"); + knockService.registerPath(TestContext.class, BA_NODE_A_ID).setKnockKnockResult(knockResult); + + OpendaylightOfMigrationTestModelService baKnockInvoker = + providerRegistry.getRpcService(OpendaylightOfMigrationTestModelService.class); + + final KnockKnockInput knockInput = knockKnock(BA_NODE_A_ID).setQuestion("Who's there?").build(); + ListenableFuture> future = baKnockInvoker.knockKnock(knockInput); + + final RpcResult rpcResult = future.get(5, TimeUnit.SECONDS); + + assertEquals(knockResult.get().getResult().getClass(), rpcResult.getResult().getClass()); + assertSame(knockResult.get().getResult(), rpcResult.getResult()); + assertSame(knockInput, knockService.getReceivedKnocks().get(BA_NODE_A_ID).iterator().next()); + } + + @Test + public void testBindingRpcShortcutRegisteredViaMdsalAPI() + throws InterruptedException, ExecutionException, TimeoutException { + final ListenableFuture> knockResult = knockResult(true, "open"); + + BindingDOMRpcProviderServiceAdapter mdsalServiceRegistry = new BindingDOMRpcProviderServiceAdapter( + testContext.getDelegateDomRouter().getRpcProviderService(), testContext.getCodec()); + + final Multimap, KnockKnockInput> receivedKnocks = HashMultimap.create(); + mdsalServiceRegistry.registerRpcImplementation(OpendaylightOfMigrationTestModelService.class, + (OpendaylightOfMigrationTestModelService) input -> { + receivedKnocks.put(input.getKnockerId(), input); + return knockResult; + }, ImmutableSet.of(BA_NODE_A_ID)); + + OpendaylightOfMigrationTestModelService baKnockInvoker = + providerRegistry.getRpcService(OpendaylightOfMigrationTestModelService.class); + + final KnockKnockInput knockInput = knockKnock(BA_NODE_A_ID).setQuestion("Who's there?").build(); + Future> future = baKnockInvoker.knockKnock(knockInput); + + final RpcResult rpcResult = future.get(5, TimeUnit.SECONDS); + + assertEquals(knockResult.get().getResult().getClass(), rpcResult.getResult().getClass()); + assertSame(knockResult.get().getResult(), rpcResult.getResult()); + assertSame(knockInput, receivedKnocks.get(BA_NODE_A_ID).iterator().next()); + } + @Test public void bindingRoutedRpcProvider_DomInvokerTest() throws Exception { @@ -100,11 +164,11 @@ public class CrossBrokerRpcTest { KnockKnockInput knockKnockA = knockKnock(BA_NODE_A_ID) // .setQuestion("who's there?").build(); - CompositeNode knockKnockDom = toDomRpc(KNOCK_KNOCK_QNAME, knockKnockA); + ContainerNode knockKnockDom = toDomRpc(KNOCK_KNOCK_QNAME, knockKnockA); assertNotNull(knockKnockDom); - RpcResult domResult = biRpcInvoker.invokeRpc(KNOCK_KNOCK_QNAME, knockKnockDom).get(); + DOMRpcResult domResult = biRpcInvoker.invokeRpc(KNOCK_KNOCK_PATH, knockKnockDom).get(); assertNotNull(domResult); - assertTrue("DOM result is successful.", domResult.isSuccessful()); + assertNotNull("DOM result is successful.", domResult.getResult()); assertTrue("Bidning Add Flow RPC was captured.", knockService.getReceivedKnocks().containsKey(BA_NODE_A_ID)); assertEquals(knockKnockA, knockService.getReceivedKnocks().get(BA_NODE_A_ID).iterator().next()); } @@ -114,57 +178,46 @@ public class CrossBrokerRpcTest { KnockKnockOutputBuilder builder = new KnockKnockOutputBuilder(); builder.setAnswer("open"); final KnockKnockOutput output = builder.build(); - org.opendaylight.controller.sal.core.api.Broker.RoutedRpcRegistration registration = provisionRegistry.addRoutedRpcImplementation(KNOCK_KNOCK_QNAME, new RpcImplementation() { - @Override - public Set getSupportedRpcs() { - return ImmutableSet.of(KNOCK_KNOCK_QNAME); - } - - @Override - public ListenableFuture> invokeRpc(QName rpc, CompositeNode input) { - CompositeNode result = testContext.getBindingToDomMappingService().toDataDom(output); - return Futures.immediateFuture(RpcResultBuilder.success(result).build()); - } - }); - registration.registerPath(TestContext.QNAME, BI_NODE_C_ID); + provisionRegistry.registerRpcImplementation((rpc, input) -> { + ContainerNode result = testContext.getCodec().getCodecFactory().toNormalizedNodeRpcData(output); + return Futures.immediateCheckedFuture(new DefaultDOMRpcResult(result)); + }, DOMRpcIdentifier.create(KNOCK_KNOCK_PATH, BI_NODE_C_ID)); OpendaylightOfMigrationTestModelService baKnockInvoker = providerRegistry.getRpcService(OpendaylightOfMigrationTestModelService.class); - Future> baResult = baKnockInvoker.knockKnock((knockKnock(BA_NODE_C_ID).setQuestion("Who's there?").build())); + Future> baResult = baKnockInvoker.knockKnock(knockKnock(BA_NODE_C_ID) + .setQuestion("Who's there?").build()); assertNotNull(baResult); assertEquals(output, baResult.get().getResult()); } - private CompositeNode toDomRpcInput(DataObject addFlowA) { - return testContext.getBindingToDomMappingService().toDataDom(addFlowA); - } - - @After - public void teardown() throws Exception { - testContext.close(); + private ContainerNode toDomRpcInput(final DataObject addFlowA) { + return testContext.getCodec().getCodecFactory().toNormalizedNodeRpcData(addFlowA); } - private static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier createBINodeIdentifier(TopLevelListKey listKey) { + private static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier createBINodeIdentifier( + final TopLevelListKey listKey) { return org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.builder().node(Top.QNAME) - .nodeWithKey(TopLevelList.QNAME, NODE_ID_QNAME, listKey.getName()).toInstance(); + .node(TopLevelList.QNAME) + .nodeWithKey(TopLevelList.QNAME, NODE_ID_QNAME, listKey.getName()).build(); } - private Future> knockResult(boolean success, String answer) { - KnockKnockOutput output = new KnockKnockOutputBuilder() // - .setAnswer(answer).build(); - RpcResult result = RpcResultBuilder.status(success).withResult(output).build(); + private static ListenableFuture> knockResult(final boolean success, + final String answer) { + KnockKnockOutput output = new KnockKnockOutputBuilder().setAnswer(answer).build(); + RpcResult result = RpcResultBuilder.status(success).withResult(output) + .build(); return Futures.immediateFuture(result); } - private static KnockKnockInputBuilder knockKnock(InstanceIdentifier listId) { + private static KnockKnockInputBuilder knockKnock(final InstanceIdentifier listId) { KnockKnockInputBuilder builder = new KnockKnockInputBuilder(); builder.setKnockerId(listId); return builder; } - private CompositeNode toDomRpc(QName rpcName, KnockKnockInput knockInput) { - return new CompositeNodeTOImpl(rpcName, null, - Collections.>singletonList(toDomRpcInput(knockInput))); + private ContainerNode toDomRpc(final QName rpcName, final KnockKnockInput knockInput) { + return toDomRpcInput(knockInput); } }