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>
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();
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() {
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,
@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,
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"));
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());
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());
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);
@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