X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fimpl%2FPceServiceRPCImpl.java;h=49f8e71b9d29ff7ca5613774315f34f931b90c2d;hb=b1b3bafd549bb501937cea5c976d5344608b6ed3;hp=0d853d3c229c5ef8333a926258ea8684ed4b34c2;hpb=4378fca1d31d1f75c0480c752aa711fb885e6135;p=transportpce.git

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java
index 0d853d3c2..49f8e71b9 100644
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java
@@ -7,57 +7,47 @@
  */
 package org.opendaylight.transportpce.pce.impl;
 
-import com.google.common.util.concurrent.ListenableFuture;
-
-import java.util.concurrent.ExecutionException;
-
+import com.google.common.collect.ImmutableClassToInstanceMap;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.transportpce.pce.service.PathComputationService;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.CancelResourceReserveInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.CancelResourceReserveOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.TransportpcePceService;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.CancelResourceReserve;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequest;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRerouteRequest;
+import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.binding.Rpc;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * PceService implementation.
  */
-public class PceServiceRPCImpl implements TransportpcePceService {
-
+@Component(immediate = true)
+public class PceServiceRPCImpl {
     private static final Logger LOG = LoggerFactory.getLogger(PceServiceRPCImpl.class);
-
-    private final PathComputationService pathComputationService;
-
-    public PceServiceRPCImpl(PathComputationService pathComputationService) {
-        this.pathComputationService = pathComputationService;
+    private Registration reg;
+
+    @Activate
+    public PceServiceRPCImpl(@Reference RpcProviderService rpcProviderService,
+            @Reference PathComputationService pathComputationService) {
+        this.reg = rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
+            .put(CancelResourceReserve.class, new CancelResourceReserveImpl(pathComputationService))
+            .put(PathComputationRequest.class, new PathComputationRequestImpl(pathComputationService))
+            .put(PathComputationRerouteRequest.class, new PathComputationRerouteRequestImpl(pathComputationService))
+            .build());
+        LOG.info("PceServiceRPCImpl instantiated");
     }
 
-    @Override
-    public ListenableFuture<RpcResult<CancelResourceReserveOutput>>
-            cancelResourceReserve(CancelResourceReserveInput input) {
-        LOG.info("RPC cancelResourceReserve request received");
-        CancelResourceReserveOutput output = null;
-        try {
-            output = this.pathComputationService.cancelResourceReserve(input).get();
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("RPC cancelResourceReserve failed !", e);
-        }
-        return RpcResultBuilder.success(output).buildFuture();
+    @Deactivate
+    public void close() {
+        this.reg.close();
+        LOG.info("PceServiceRPCImpl Closed");
     }
 
-    @Override
-    public ListenableFuture<RpcResult<PathComputationRequestOutput>>
-            pathComputationRequest(PathComputationRequestInput input) {
-        LOG.info("RPC path computation request received");
-        PathComputationRequestOutput output = null;
-        try {
-            output = this.pathComputationService.pathComputationRequest(input).get();
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("RPC path computation request failed !", e);
-        }
-        return RpcResultBuilder.success(output).buildFuture();
+    public Registration getRegisteredRpc() {
+        return reg;
     }
-}
\ No newline at end of file
+}