Skip to content

Commit 7ef7adb

Browse files
Tobianasihrasko
authored andcommitted
Provide RpcConsumerRegistry to LightyServices
Due to MDSAL RpcService to Rpc<?,?> migration, RpcService instance is extracted from RpcConsumerRegistry. We want to have RpcConsumerRegistry available in LightyServices to easily access it anywhere. Fixes #1775 Signed-off-by: tobias.pobocik <tobias.pobocik@pantheon.tech> Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>
1 parent 4b58881 commit 7ef7adb

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/LightyServices.java

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.opendaylight.mdsal.binding.api.MountPointService;
2424
import org.opendaylight.mdsal.binding.api.NotificationPublishService;
2525
import org.opendaylight.mdsal.binding.api.NotificationService;
26+
import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
2627
import org.opendaylight.mdsal.binding.api.RpcProviderService;
2728
import org.opendaylight.mdsal.binding.dom.adapter.ConstantAdapterContext;
2829
import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory;
@@ -131,4 +132,6 @@ public interface LightyServices extends LightyModuleRegistryService {
131132

132133
ActionService getActionService();
133134

135+
RpcConsumerRegistry getRpcConsumerRegistry();
136+
134137
}

lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/LightyControllerImpl.java

+8
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
import org.opendaylight.mdsal.binding.api.MountPointService;
8080
import org.opendaylight.mdsal.binding.api.NotificationPublishService;
8181
import org.opendaylight.mdsal.binding.api.NotificationService;
82+
import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
8283
import org.opendaylight.mdsal.binding.api.RpcProviderService;
8384
import org.opendaylight.mdsal.binding.dom.adapter.BindingAdapterFactory;
8485
import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMMountPointServiceAdapter;
@@ -196,6 +197,7 @@ public class LightyControllerImpl extends AbstractLightyModule implements Lighty
196197
private AkkaManagement akkaManagement;
197198
private Optional<ClusteringHandler> clusteringHandler;
198199
private Optional<InitialConfigData> initialConfigData;
200+
private RpcConsumerRegistry rpcConsumerRegistry;
199201

200202

201203
public LightyControllerImpl(final ExecutorService executorService, final Config actorSystemConfig,
@@ -306,6 +308,7 @@ protected boolean initProcedure() {
306308
this.actionProviderService = this.bindingAdapterFactory.createActionProviderService(
307309
this.domActionProviderService);
308310
this.actionService = bindingAdapterFactory.createActionService(this.domActionService);
311+
rpcConsumerRegistry = bindingAdapterFactory.createRpcConsumerRegistry(domRpcRouter.getRpcService());
309312

310313
this.rpcProviderService = new BindingDOMRpcProviderServiceAdapter(this.codec,
311314
this.domRpcRouter.getRpcProviderService());
@@ -664,6 +667,11 @@ public ActionProviderService getActionProviderService() {
664667
return actionProviderService;
665668
}
666669

670+
@Override
671+
public RpcConsumerRegistry getRpcConsumerRegistry() {
672+
return rpcConsumerRegistry;
673+
}
674+
667675
@Override
668676
public ActionService getActionService() {
669677
return actionService;

0 commit comments

Comments
 (0)