X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2FRemoteRpcImplementation.java;h=404a109741b56a0344ec5d413342badfe41ee06c;hb=a3fd2b66c8121a8603d684b97c1fb7076d933d99;hp=7d7dbf0f3a58bc404882ad78186340d8eef2aba9;hpb=7f8512fcbe4ac373995b7e2e370d38a01f4eaeec;p=controller.git

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java
index 7d7dbf0f3a..404a109741 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java
@@ -1,98 +1,29 @@
 package org.opendaylight.controller.remote.rpc;
 
 import static akka.pattern.Patterns.ask;
-import akka.actor.ActorRef;
-import akka.dispatch.OnComplete;
-import akka.util.Timeout;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
 
+import akka.actor.ActorRef;
+import com.google.common.util.concurrent.CheckedFuture;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementation;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
 import org.opendaylight.controller.remote.rpc.messages.InvokeRpc;
-import org.opendaylight.controller.remote.rpc.messages.RpcResponse;
-import org.opendaylight.controller.remote.rpc.utils.ActorUtil;
-import org.opendaylight.controller.xml.codec.XmlUtils;
-import org.opendaylight.controller.sal.core.api.RoutedRpcDefaultImplementation;
-import org.opendaylight.controller.sal.core.api.RpcImplementation;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-import scala.concurrent.ExecutionContext;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class RemoteRpcImplementation implements RpcImplementation, RoutedRpcDefaultImplementation {
-    private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcImplementation.class);
+public class RemoteRpcImplementation implements DOMRpcImplementation {
     private final ActorRef rpcBroker;
-    private final SchemaContext schemaContext;
+    private final RemoteRpcProviderConfig config;
 
-    public RemoteRpcImplementation(ActorRef rpcBroker, SchemaContext schemaContext) {
+    public RemoteRpcImplementation(final ActorRef rpcBroker, final RemoteRpcProviderConfig config) {
         this.rpcBroker = rpcBroker;
-        this.schemaContext = schemaContext;
-    }
-
-    @Override
-    public ListenableFuture<RpcResult<CompositeNode>> invokeRpc(QName rpc,
-            YangInstanceIdentifier identifier, CompositeNode input) {
-        InvokeRpc rpcMsg = new InvokeRpc(rpc, identifier, input);
-
-        return executeMsg(rpcMsg);
-    }
-
-    @Override
-    public Set<QName> getSupportedRpcs() {
-        // TODO : check if we need to get this from routing registry
-        return Collections.emptySet();
+        this.config = config;
     }
 
     @Override
-    public ListenableFuture<RpcResult<CompositeNode>> invokeRpc(QName rpc, CompositeNode input) {
-        InvokeRpc rpcMsg = new InvokeRpc(rpc, null, input);
-        return executeMsg(rpcMsg);
-    }
-
-    private ListenableFuture<RpcResult<CompositeNode>> executeMsg(InvokeRpc rpcMsg) {
-
-        final SettableFuture<RpcResult<CompositeNode>> listenableFuture = SettableFuture.create();
-
-        scala.concurrent.Future<Object> future = ask(rpcBroker, rpcMsg,
-                new Timeout(ActorUtil.ASK_DURATION));
-
-        OnComplete<Object> onComplete = new OnComplete<Object>() {
-            @Override
-            public void onComplete(Throwable failure, Object reply) throws Throwable {
-                if(failure != null) {
-                    LOG.error("InvokeRpc failed", failure);
-
-                    RpcResult<CompositeNode> rpcResult;
-                    if(failure instanceof RpcErrorsException) {
-                        rpcResult = RpcResultBuilder.<CompositeNode>failed().withRpcErrors(
-                                ((RpcErrorsException)failure).getRpcErrors()).build();
-                    } else {
-                        rpcResult = RpcResultBuilder.<CompositeNode>failed().withError(
-                                ErrorType.RPC, failure.getMessage(), failure).build();
-                    }
-
-                    listenableFuture.set(rpcResult);
-                    return;
-                }
-
-                RpcResponse rpcReply = (RpcResponse)reply;
-                CompositeNode result = XmlUtils.xmlToCompositeNode(rpcReply.getResultCompositeNode());
-                listenableFuture.set(RpcResultBuilder.success(result).build());
-            }
-        };
-
-        future.onComplete(onComplete, ExecutionContext.Implicits$.MODULE$.global());
-
-        return listenableFuture;
+    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode<?, ?> input) {
+        final InvokeRpc rpcMsg = new InvokeRpc(rpc.getType().getLastComponent(), rpc.getContextReference(), input);
+        final scala.concurrent.Future<Object> future = ask(rpcBroker, rpcMsg, config.getAskDuration());
+        return RemoteDOMRpcFuture.from(future);
     }
 }