From d2e141d4e4bf73515591850d29452f075d0fc65a Mon Sep 17 00:00:00 2001 From: Ashik Alias Date: Thu, 13 Feb 2020 18:50:35 +0530 Subject: [PATCH] NETVIRT-1630 migrate to md-sal apis RpcProviderRegistry is depricated and will be removed switch to RpcProviderService and RpcConsumerRegistry Change-Id: I68b6b16ff9db6ac5e95b3626d05d0f77f4c7cd48 Signed-off-by: Ashik Alias --- .../neutronvpn/shell/ConfigureL3VpnCommand.java | 12 ++++++------ .../main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- .../netvirt/statistics/StatisticsProvider.java | 10 +++++----- .../main/resources/OSGI-INF/blueprint/statistics.xml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java index 07c21647f6..cc23258162 100644 --- a/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java +++ b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java @@ -15,7 +15,7 @@ import java.util.concurrent.Future; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.commands.Option; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.AssociateNetworksInputBuilder; @@ -39,15 +39,15 @@ public class ConfigureL3VpnCommand extends OsgiCommandSupport { private static final Logger LOG = LoggerFactory.getLogger(ConfigureL3VpnCommand.class); private INeutronVpnManager neutronVpnManager; - private RpcProviderRegistry rpcProviderRegistry; + private RpcConsumerRegistry rpcConsumerRegistry; private NeutronvpnService neutronvpnService; public void setNeutronVpnManager(INeutronVpnManager neutronVpnManager) { this.neutronVpnManager = neutronVpnManager; } - public void setRpcProviderRegistry(RpcProviderRegistry rpcProviderRegistry) { - this.rpcProviderRegistry = rpcProviderRegistry; + public void setRpcConsumerRegistry(RpcConsumerRegistry rpcConsumerRegistry) { + this.rpcConsumerRegistry = rpcConsumerRegistry; } @Option(name = "-op", aliases = {"--operation"}, description = "create-l3-vpn/delete-l3-vpn", @@ -81,8 +81,8 @@ public class ConfigureL3VpnCommand extends OsgiCommandSupport { @Override protected Object doExecute() throws Exception { - if (rpcProviderRegistry != null) { - neutronvpnService = rpcProviderRegistry.getRpcService(NeutronvpnService.class); + if (rpcConsumerRegistry != null) { + neutronvpnService = rpcConsumerRegistry.getRpcService(NeutronvpnService.class); if (neutronvpnService != null) { if (op != null) { switch (op) { diff --git a/neutronvpn/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/neutronvpn/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml index bb9a15ab14..87394b8ebb 100644 --- a/neutronvpn/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/neutronvpn/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - diff --git a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java index 1f7c952b31..4a6d242396 100644 --- a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java +++ b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java @@ -12,7 +12,7 @@ import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.controller.sal.binding.api.RpcProviderService; import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService; @@ -27,7 +27,7 @@ public class StatisticsProvider { private final DataBroker dataBroker; private final IInterfaceManager interfaceManager; - private final RpcProviderRegistry rpcProviderRegistry; + private final RpcProviderService rpcProviderService; private final IMdsalApiManager mdsalApiManager; private final IdManagerService idManagerService; private final CounterRetriever counterRetriever; @@ -35,12 +35,12 @@ public class StatisticsProvider { private CountersServiceInterfaceListener csil; @Inject - public StatisticsProvider(final DataBroker dataBroker, final RpcProviderRegistry rpcProviderRegistry, + public StatisticsProvider(final DataBroker dataBroker, final RpcProviderService rpcProviderService, CounterRetriever counterRetriever, IInterfaceManager interfaceManager, IMdsalApiManager mdsalApiManager, IdManagerService idManagerService, StatisticsCounters statisticsCounters) { this.dataBroker = dataBroker; this.interfaceManager = interfaceManager; - this.rpcProviderRegistry = rpcProviderRegistry; + this.rpcProviderService = rpcProviderService; this.mdsalApiManager = mdsalApiManager; this.counterRetriever = counterRetriever; this.idManagerService = idManagerService; @@ -53,7 +53,7 @@ public class StatisticsProvider { StatisticsImpl statisticsImpl = new StatisticsImpl(dataBroker, counterRetriever, interfaceManager, mdsalApiManager, idManagerService, statisticsCounters); - rpcProviderRegistry.addRpcImplementation(StatisticsService.class, statisticsImpl); + rpcProviderService.addRpcImplementation(StatisticsService.class, statisticsImpl); csil = new CountersServiceInterfaceListener(dataBroker, statisticsImpl); } diff --git a/statistics/impl/src/main/resources/OSGI-INF/blueprint/statistics.xml b/statistics/impl/src/main/resources/OSGI-INF/blueprint/statistics.xml index 60ed0dda5b..9c68e7131d 100644 --- a/statistics/impl/src/main/resources/OSGI-INF/blueprint/statistics.xml +++ b/statistics/impl/src/main/resources/OSGI-INF/blueprint/statistics.xml @@ -12,7 +12,7 @@ interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" odl:type="default" /> + interface="org.opendaylight.controller.sal.binding.api.RpcProviderService" />