Do not use RpcService in pcep-topology-provider

[bgpcep.git] / pcep / topology / topology-provider / src / main / java / org / opendaylight / bgpcep / pcep / topology / provider / PCEPTopologyProvider.java

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java
index 3281df9035f68628936d1828991645a86e5240bf..6399ba113e5bcad5246221e71fa5ad6d0a775c3b 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java
@@ -20,7 +20,6 @@ import io.netty.channel.epoll.EpollChannelOption;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.checkerframework.checker.lock.qual.GuardedBy;
@@ -30,8 +29,6 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.bgpcep.programming.spi.InstructionScheduler;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.programming.rev181109.NetworkTopologyPcepProgrammingService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.NetworkTopologyPcepService;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
 import org.opendaylight.yangtools.concepts.Registration;
@@ -247,10 +244,8 @@ final class PCEPTopologyProvider extends DefaultTopologyReference {
 
         // Register RPCs
         final RpcProviderService rpcRegistry = dependencies.getRpcProviderRegistry();
-        elementReg = rpcRegistry.registerRpcImplementation(NetworkTopologyPcepService.class,
-            new TopologyRPCs(manager), Set.of(instanceIdentifier));
-        networkReg = rpcRegistry.registerRpcImplementation(NetworkTopologyPcepProgrammingService.class,
-            new TopologyProgramming(scheduler, manager), Set.of(instanceIdentifier));
+        elementReg = new TopologyRPCs(manager).register(rpcRegistry, instanceIdentifier);
+        networkReg = new TopologyProgramming(scheduler, manager).register(rpcRegistry, instanceIdentifier);
 
         // We are now completely initialized
         LOG.info("PCEP Topology Provider {} enabled", topologyId());