Do not use RpcService in pcep-tunnel-provider

[bgpcep.git] / pcep / tunnel / tunnel-provider / src / main / java / org / opendaylight / bgpcep / pcep / tunnel / provider / TunnelProgramming.java

diff --git a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java
index 1f1928ee366fcb20d284b9bfcab69524cca1acfe..7fa3e63c1060e10c9d4de096678126e07ea8cff1 100644 (file)
--- a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java
+++ b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java
@@ -9,28 +9,39 @@ package org.opendaylight.bgpcep.pcep.tunnel.provider;
 
 import static java.util.Objects.requireNonNull;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.bgpcep.pcep.topology.spi.AbstractInstructionExecutor;
 import org.opendaylight.bgpcep.programming.spi.InstructionScheduler;
 import org.opendaylight.bgpcep.programming.spi.SuccessfulRpcResult;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepCreateP2pTunnel;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepCreateP2pTunnelInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepCreateP2pTunnelOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepCreateP2pTunnelOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepDestroyTunnel;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepDestroyTunnelInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepDestroyTunnelOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepDestroyTunnelOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepUpdateTunnel;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepUpdateTunnelInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepUpdateTunnelOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepUpdateTunnelOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.TopologyTunnelPcepProgrammingService;
+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;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.Rpc;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class TunnelProgramming implements TopologyTunnelPcepProgrammingService, AutoCloseable {
+public final class TunnelProgramming implements AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(TunnelProgramming.class);
+
     private final InstructionScheduler scheduler;
     private final TunnelProviderDependencies dependencies;
 
@@ -40,41 +51,40 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer
         this.dependencies = requireNonNull(dependencies);
     }
 
-    @Override
-    public ListenableFuture<RpcResult<PcepCreateP2pTunnelOutput>> pcepCreateP2pTunnel(
+    Registration register(final KeyedInstanceIdentifier<Topology, TopologyKey> topologyPath) {
+        return dependencies.getRpcProviderRegistry().registerRpcImplementations(
+            ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
+                .put(PcepCreateP2pTunnel.class, this::pcepCreateP2pTunnel)
+                .put(PcepDestroyTunnel.class, this::pcepDestroyTunnel)
+                .put(PcepUpdateTunnel.class, this::pcepUpdateTunnel)
+                .build(), Set.of(topologyPath));
+    }
+
+    @VisibleForTesting
+    ListenableFuture<RpcResult<PcepCreateP2pTunnelOutput>> pcepCreateP2pTunnel(
             final PcepCreateP2pTunnelInput p2pTunnelInput) {
-        final PcepCreateP2pTunnelOutputBuilder b = new PcepCreateP2pTunnelOutputBuilder();
-        b.setResult(AbstractInstructionExecutor.schedule(this.scheduler,
-                new CreateTunnelInstructionExecutor(p2pTunnelInput,
-                        TunnelProgramming.this.dependencies.getDataBroker(),
-                        TunnelProgramming.this.dependencies.getNtps())));
-        final RpcResult<PcepCreateP2pTunnelOutput> res = SuccessfulRpcResult.create(b.build());
-        return Futures.immediateFuture(res);
+        return Futures.immediateFuture(SuccessfulRpcResult.create(new PcepCreateP2pTunnelOutputBuilder()
+            .setResult(AbstractInstructionExecutor.schedule(scheduler, new CreateTunnelInstructionExecutor(
+                p2pTunnelInput, dependencies.getDataBroker(), dependencies.getRpcConsumerRegistry())))
+            .build()));
     }
 
-    @Override
-    public ListenableFuture<RpcResult<PcepDestroyTunnelOutput>> pcepDestroyTunnel(
+    @VisibleForTesting
+    ListenableFuture<RpcResult<PcepDestroyTunnelOutput>> pcepDestroyTunnel(
             final PcepDestroyTunnelInput destroyTunnelInput) {
-        final PcepDestroyTunnelOutputBuilder b = new PcepDestroyTunnelOutputBuilder();
-        b.setResult(AbstractInstructionExecutor.schedule(this.scheduler,
-                new DestroyTunnelInstructionExecutor(destroyTunnelInput,
-                        TunnelProgramming.this.dependencies.getDataBroker(),
-                        TunnelProgramming.this.dependencies.getNtps())));
-        final RpcResult<PcepDestroyTunnelOutput> res = SuccessfulRpcResult.create(b.build());
-        return Futures.immediateFuture(res);
+        return Futures.immediateFuture(SuccessfulRpcResult.create(new PcepDestroyTunnelOutputBuilder()
+            .setResult(AbstractInstructionExecutor.schedule(scheduler, new DestroyTunnelInstructionExecutor(
+                destroyTunnelInput, dependencies.getDataBroker(), dependencies.getRpcConsumerRegistry())))
+            .build()));
     }
 
-    @Override
-    public ListenableFuture<RpcResult<PcepUpdateTunnelOutput>> pcepUpdateTunnel(
+    @VisibleForTesting
+    ListenableFuture<RpcResult<PcepUpdateTunnelOutput>> pcepUpdateTunnel(
             final PcepUpdateTunnelInput updateTunnelInput) {
-        final PcepUpdateTunnelOutputBuilder b = new PcepUpdateTunnelOutputBuilder();
-        b.setResult(AbstractInstructionExecutor.schedule(this.scheduler,
-                new UpdateTunnelInstructionExecutor(updateTunnelInput,
-                        TunnelProgramming.this.dependencies.getDataBroker(),
-                        TunnelProgramming.this.dependencies.getNtps())));
-
-        final RpcResult<PcepUpdateTunnelOutput> res = SuccessfulRpcResult.create(b.build());
-        return Futures.immediateFuture(res);
+        return Futures.immediateFuture(SuccessfulRpcResult.create(new PcepUpdateTunnelOutputBuilder()
+            .setResult(AbstractInstructionExecutor.schedule(scheduler, new UpdateTunnelInstructionExecutor(
+                updateTunnelInput, dependencies.getDataBroker(), dependencies.getRpcConsumerRegistry())))
+            .build()));
     }
 
     @Override