From: Robert Varga Date: Fri, 20 Jul 2018 08:15:00 +0000 (+0200) Subject: Fix DOMRpcRouter breakage from mdsal X-Git-Tag: release/fluorine~31 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=eb64259379b9c6d91efd671c88d77f6d2b364477 Fix DOMRpcRouter breakage from mdsal MD-SAL's DOMRpcRouter no longer directly implements services, acquire them from the accessor methods. Change-Id: Icf337e8b8183726c87bf38d3252dccb0b911ba17 Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java index a337b5312a..5391c3e58a 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java @@ -174,7 +174,7 @@ public class BindingTestContext implements AutoCloseable { this.mockSchemaService.changeSchema(getContext(moduleInfos)); } - private SchemaContext getContext(final Set moduleInfos) { + private static SchemaContext getContext(final Set moduleInfos) { final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); ctx.addModuleInfos(moduleInfos); return ctx.tryToCreateSchemaContext().get(); @@ -207,7 +207,7 @@ public class BindingTestContext implements AutoCloseable { checkState(this.executor != null); delegateDomRouter = org.opendaylight.mdsal.dom.broker.DOMRpcRouter.newInstance(mockSchemaService); - this.domRouter = new DOMRpcRouter(delegateDomRouter, delegateDomRouter); + this.domRouter = new DOMRpcRouter(delegateDomRouter.getRpcService(), delegateDomRouter.getRpcProviderService()); } public void startBindingNotificationBroker() { 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 dcdb5a1b0e..6f50247c0e 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 @@ -127,7 +127,7 @@ public class CrossBrokerRpcTest { final ListenableFuture> knockResult = knockResult(true, "open"); BindingDOMRpcProviderServiceAdapter mdsalServiceRegistry = new BindingDOMRpcProviderServiceAdapter( - testContext.getDelegateDomRouter(), testContext.getCodec()); + testContext.getDelegateDomRouter().getRpcProviderService(), testContext.getCodec()); final Multimap, KnockKnockInput> receivedKnocks = HashMultimap.create(); mdsalServiceRegistry.registerRpcImplementation(OpendaylightOfMigrationTestModelService.class, diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java index 54845cf097..f95ef1a936 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java @@ -46,8 +46,8 @@ public final class DOMRpcRouter implements AutoCloseable, DOMRpcService, DOMRpcP @VisibleForTesting public DOMRpcRouter() { org.opendaylight.mdsal.dom.broker.DOMRpcRouter delegate = new org.opendaylight.mdsal.dom.broker.DOMRpcRouter(); - this.delegateRpcService = delegate; - this.delegateRpcProviderService = delegate; + this.delegateRpcService = delegate.getRpcService(); + this.delegateRpcProviderService = delegate.getRpcProviderService(); } public DOMRpcRouter(final org.opendaylight.mdsal.dom.api.DOMRpcService delegateRpcService, diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouterTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouterTest.java index e2356e3f43..4f555fbdca 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouterTest.java +++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouterTest.java @@ -78,7 +78,7 @@ public class DOMRpcRouterTest { mdsalRpcRouter = new org.opendaylight.mdsal.dom.broker.DOMRpcRouter(); final SchemaContext schemaContext = TestModel.createTestContext(); mdsalRpcRouter.onGlobalContextUpdated(schemaContext); - legacyRpcRouter = new DOMRpcRouter(mdsalRpcRouter, mdsalRpcRouter); + legacyRpcRouter = new DOMRpcRouter(mdsalRpcRouter.getRpcService(), mdsalRpcRouter.getRpcProviderService()); legacyTestRpcIdentifier = DOMRpcIdentifier.create(findRpc(schemaContext, "test-rpc")); legacyTestRpcNoInputIdentifier = DOMRpcIdentifier.create(findRpc(schemaContext, "test-rpc-no-input")); @@ -149,7 +149,7 @@ public class DOMRpcRouterTest { testLegacyRpcImpl.init(Futures.immediateCheckedFuture(result)); ListenableFuture future = - mdsalRpcRouter.invokeRpc(mdsalTestRpcIdentifier.getType(), RPC_INPUT); + mdsalRpcRouter.getRpcService().invokeRpc(mdsalTestRpcIdentifier.getType(), RPC_INPUT); assertEquals(RPC_OUTPUT, future.get().getResult()); assertEquals(1, future.get().getErrors().size()); @@ -164,7 +164,7 @@ public class DOMRpcRouterTest { testLegacyRpcImpl.init(Futures.immediateFailedCheckedFuture(rpcEx)); try { - mdsalRpcRouter.invokeRpc(mdsalTestRpcIdentifier.getType(), RPC_INPUT).get(); + mdsalRpcRouter.getRpcService().invokeRpc(mdsalTestRpcIdentifier.getType(), RPC_INPUT).get(); fail("Expected exception"); } catch (ExecutionException e) { assertEquals(rpcEx, e.getCause()); @@ -174,7 +174,7 @@ public class DOMRpcRouterTest { testLegacyRpcImpl.init(Futures.immediateCheckedFuture(null)); - future = mdsalRpcRouter.invokeRpc(mdsalTestRpcNoInputIdentifier.getType(), null); + future = mdsalRpcRouter.getRpcService().invokeRpc(mdsalTestRpcNoInputIdentifier.getType(), null); assertNull(future.get()); testLegacyRpcImpl.verifyInput(legacyTestRpcNoInputIdentifier, null); @@ -182,7 +182,7 @@ public class DOMRpcRouterTest { @Test public void testMdsalRegistrationAndLegacyInvocation() throws InterruptedException, ExecutionException { - mdsalRpcRouter.registerRpcImplementation(testMdsalRpcImpl, mdsalTestRpcIdentifier, + mdsalRpcRouter.getRpcProviderService().registerRpcImplementation(testMdsalRpcImpl, mdsalTestRpcIdentifier, mdsalTestRpcNoInputIdentifier); // Test success