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=a6b5cba145fb45dd3c0d435e28843223279b02fc;hp=83c2f88376239a29bd0bf09060dc981fff2a1f65;hb=f259ac42bbaa656dea3fef8ebb439243d3bb1531;hpb=c31509c7a6630e54a9f9749a643fed5e1a1ad380 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..a6b5cba145 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 @@ -12,18 +12,20 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableSet; 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.Future; 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.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 +40,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,6 +57,7 @@ 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); @@ -70,7 +70,7 @@ public class CrossBrokerRpcTest { @Before public void setup() { BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); - testFactory.setExecutor(MoreExecutors.sameThreadExecutor()); + testFactory.setExecutor(MoreExecutors.newDirectExecutorService()); testFactory.setStartWithParsedSchema(true); testContext = testFactory.getTestContext(); @@ -100,11 +100,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,20 +114,11 @@ 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); @@ -136,8 +127,8 @@ public class CrossBrokerRpcTest { assertEquals(output, baResult.get().getResult()); } - private CompositeNode toDomRpcInput(DataObject addFlowA) { - return testContext.getBindingToDomMappingService().toDataDom(addFlowA); + private ContainerNode toDomRpcInput(final DataObject addFlowA) { + return testContext.getCodec().getCodecFactory().toNormalizedNodeRpcData(addFlowA); } @After @@ -145,26 +136,26 @@ public class CrossBrokerRpcTest { testContext.close(); } - 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) { + private Future> 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); } }