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 <robert.varga@pantheon.tech>

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 a337b5312a9b1a98e680be98e2d8f2391be5b4dd..5391c3e58a8b8a8fcdd4523c26ddcc7c7b6892cc 100644 (file)
--- 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));
     }
 
         this.mockSchemaService.changeSchema(getContext(moduleInfos));
     }
 

-    private SchemaContext getContext(final Set<YangModuleInfo> moduleInfos) {
+    private static SchemaContext getContext(final Set<YangModuleInfo> moduleInfos) {

         final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create();
         ctx.addModuleInfos(moduleInfos);
         return ctx.tryToCreateSchemaContext().get();
         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);
         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() {
     }
 
     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 dcdb5a1b0e64cfa02ec096063547047c9642a01b..6f50247c0e43cb1f9a56680ca25254ba1abbd7ab 100644 (file)
--- 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<RpcResult<KnockKnockOutput>> knockResult = knockResult(true, "open");
 
         BindingDOMRpcProviderServiceAdapter mdsalServiceRegistry = new BindingDOMRpcProviderServiceAdapter(
         final ListenableFuture<RpcResult<KnockKnockOutput>> knockResult = knockResult(true, "open");
 
         BindingDOMRpcProviderServiceAdapter mdsalServiceRegistry = new BindingDOMRpcProviderServiceAdapter(

-                testContext.getDelegateDomRouter(), testContext.getCodec());
+                testContext.getDelegateDomRouter().getRpcProviderService(), testContext.getCodec());

 
         final Multimap<InstanceIdentifier<?>, KnockKnockInput> receivedKnocks = HashMultimap.create();
         mdsalServiceRegistry.registerRpcImplementation(OpendaylightOfMigrationTestModelService.class,
 
         final Multimap<InstanceIdentifier<?>, 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 54845cf09787d7d48131ca2268452376fc208928..f95ef1a9367c9cb9bd62daaeb8456a10af06a889 100644 (file)
--- 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();
     @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,
     }
 
     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 e2356e3f430569f2fa601b4151efce5134b79316..4f555fbdca817d8c3cfb68463fd337cf0196d34d 100644 (file)
--- 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);
         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"));
 
         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<org.opendaylight.mdsal.dom.api.DOMRpcResult> future =
         testLegacyRpcImpl.init(Futures.immediateCheckedFuture(result));
 
         ListenableFuture<org.opendaylight.mdsal.dom.api.DOMRpcResult> 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());
 
         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 {
         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());
             fail("Expected exception");
         } catch (ExecutionException e) {
             assertEquals(rpcEx, e.getCause());


@@ -174,7 +174,7 @@ public class DOMRpcRouterTest {
 
         testLegacyRpcImpl.init(Futures.immediateCheckedFuture(null));
 
 
         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);
 
         assertNull(future.get());
         testLegacyRpcImpl.verifyInput(legacyTestRpcNoInputIdentifier, null);


@@ -182,7 +182,7 @@ public class DOMRpcRouterTest {
 
     @Test
     public void testMdsalRegistrationAndLegacyInvocation() throws InterruptedException, ExecutionException {
 
     @Test
     public void testMdsalRegistrationAndLegacyInvocation() throws InterruptedException, ExecutionException {

-        mdsalRpcRouter.registerRpcImplementation(testMdsalRpcImpl, mdsalTestRpcIdentifier,
+        mdsalRpcRouter.getRpcProviderService().registerRpcImplementation(testMdsalRpcImpl, mdsalTestRpcIdentifier,

                 mdsalTestRpcNoInputIdentifier);
 
         // Test success
                 mdsalTestRpcNoInputIdentifier);
 
         // Test success