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%2FDOMRpcServiceTestBugfix560.java;h=81171349d739d75cf4f1e12e5317618896565fa9;hp=7595ec01059ce9772ad84bada2a5b55e1db5d693;hb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;hpb=614324d63a339ef4acbc9e2c3bbaaef469f97868 diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/DOMRpcServiceTestBugfix560.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/DOMRpcServiceTestBugfix560.java index 7595ec0105..81171349d7 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/DOMRpcServiceTestBugfix560.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/DOMRpcServiceTestBugfix560.java @@ -11,43 +11,45 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.InputStream; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import com.google.common.base.Optional; +import com.google.common.util.concurrent.CheckedFuture; +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 org.junit.After; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.sal.binding.api.mount.MountProviderInstance; -import org.opendaylight.controller.sal.binding.api.mount.MountProviderService; +import org.opendaylight.controller.md.sal.binding.api.MountPoint; +import org.opendaylight.controller.md.sal.binding.api.MountPointService; +import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcException; +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.RpcConsumerRegistry; 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.mount.MountProvisionInstance; -import org.opendaylight.controller.sal.core.api.mount.MountProvisionService; +import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.OpendaylightTestRpcServiceService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.RockTheHouseInputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.RockTheHouseOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListKey; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; +import org.opendaylight.yangtools.yang.binding.YangModuleInfo; 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.model.api.Module; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; -import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; - -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 org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; +import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; +import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * Test case for reported bug 560 @@ -70,8 +72,8 @@ public class DOMRpcServiceTestBugfix560 { private static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier BI_MOUNT_ID = createBITllIdentifier(TLL_NAME); private BindingTestContext testContext; - private MountProvisionService domMountPointService; - private MountProviderService bindingMountPointService; + private DOMMountPointService domMountPointService; + private MountPointService bindingMountPointService; private SchemaContext schemaContext; /** @@ -79,87 +81,73 @@ public class DOMRpcServiceTestBugfix560 { */ @Before public void setUp() throws Exception { - BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); - testFactory.setExecutor(MoreExecutors.sameThreadExecutor()); + final BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); + testFactory.setExecutor(MoreExecutors.newDirectExecutorService()); testFactory.setStartWithParsedSchema(true); testContext = testFactory.getTestContext(); testContext.start(); domMountPointService = testContext.getDomMountProviderService(); - bindingMountPointService = testContext.getBindingMountProviderService(); + bindingMountPointService = testContext.getBindingMountPointService(); assertNotNull(domMountPointService); - final YangContextParser parser = new YangParserImpl(); - final InputStream moduleStream = BindingReflections.getModuleInfo( - OpendaylightTestRpcServiceService.class) - .getModuleSourceStream(); - - assertNotNull(moduleStream); - List rpcModels = Collections.singletonList(moduleStream); - @SuppressWarnings("deprecation") - Set modules = parser.parseYangModelsFromStreams(rpcModels); - @SuppressWarnings("deprecation") - SchemaContext mountSchemaContext = parser.resolveSchemaContext(modules); - schemaContext = mountSchemaContext; + final YangModuleInfo moduleInfo = BindingReflections.getModuleInfo(OpendaylightTestRpcServiceService.class); + assertNotNull(moduleInfo); + + schemaContext = YangParserTestUtils.parseYangSources(StatementParserMode.DEFAULT_MODE, null, + YangTextSchemaSource.delegateForByteSource(RevisionSourceIdentifier.create( + moduleInfo.getName().getLocalName(), moduleInfo.getName().getRevision()), + moduleInfo.getYangTextByteSource())); } private static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier createBITllIdentifier( final String mount) { return org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier .builder().node(Top.QNAME) + .node(TopLevelList.QNAME) .nodeWithKey(TopLevelList.QNAME, TLL_NAME_QNAME, mount) - .toInstance(); + .build(); } private static InstanceIdentifier createBATllIdentifier( final String mount) { return InstanceIdentifier.builder(Top.class) - .child(TopLevelList.class, new TopLevelListKey(mount)).toInstance(); + .child(TopLevelList.class, new TopLevelListKey(mount)).build(); } - @SuppressWarnings("deprecation") @Test public void test() throws ExecutionException, InterruptedException { - // FIXME: This is made to only make sure instance identifier codec - // for path is instantiated. - testContext.getBindingDataBroker().readOperationalData(BA_MOUNT_ID); - final MountProvisionInstance mountPoint = domMountPointService - .createMountPoint(BI_MOUNT_ID); - mountPoint.setSchemaContext(schemaContext); - assertNotNull(mountPoint); - - mountPoint.addRpcImplementation(RPC_NAME, new RpcImplementation() { - - @Override - public ListenableFuture> invokeRpc( - final QName rpc, final CompositeNode input) { - - return Futures.immediateFuture(RpcResultBuilder - . success().build()); - } - - @Override - public Set getSupportedRpcs() { - return ImmutableSet.of(RPC_NAME); - } - }); - - final Set biSupportedRpcs = mountPoint.getSupportedRpcs(); - assertNotNull(biSupportedRpcs); - assertTrue(!biSupportedRpcs.isEmpty()); - - MountProviderInstance mountInstance = bindingMountPointService - .getMountPoint(BA_MOUNT_ID); - assertNotNull(mountInstance); - final OpendaylightTestRpcServiceService rpcService = mountInstance + // FIXME: This is made to only make sure instance identifier codec for path is instantiated. + domMountPointService + .createMountPoint(BI_MOUNT_ID).addService(DOMRpcService.class, new DOMRpcService() { + + @Override + public ListenerRegistration registerRpcListener(final T arg0) { + // TODO Auto-generated method stub + return null; + } + + @Override + public CheckedFuture invokeRpc(final SchemaPath arg0, final NormalizedNode arg1) { + final DOMRpcResult result = new DefaultDOMRpcResult((NormalizedNode) null); + return Futures.immediateCheckedFuture(result); + } + }).register(); + + final Optional mountInstance = bindingMountPointService.getMountPoint(BA_MOUNT_ID); + assertTrue(mountInstance.isPresent()); + + final Optional rpcRegistry = mountInstance.get().getService(RpcConsumerRegistry.class); + assertTrue(rpcRegistry.isPresent()); + final OpendaylightTestRpcServiceService rpcService = rpcRegistry.get() .getRpcService(OpendaylightTestRpcServiceService.class); assertNotNull(rpcService); try { - Future> result = rpcService + final ListenableFuture> result = rpcService .rockTheHouse(new RockTheHouseInputBuilder().build()); assertTrue(result.get().isSuccessful()); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { fail("OpendaylightTestRpcServiceService class doesn't contain rockTheHouse method!"); } } @@ -168,7 +156,7 @@ public class DOMRpcServiceTestBugfix560 { * @throws java.lang.Exception */ @After - public void teardown() throws Exception { + public void teardown() { testContext.close(); } }