X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fmessages%2FExecuteRpc.java;h=55f87851cc7b8168cbd627ad3d66768475f6ce91;hp=5d780be641e2cce6d2b48a2628cd675f9a24c8ee;hb=168591eb3dfc298b631e8dc51e25b0331c105cfc;hpb=bbaba878c38f381b0b924f89b29a1d0fcf6e2a2f

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
index 5d780be641..55f87851cc 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
@@ -8,29 +8,56 @@
 package org.opendaylight.controller.remote.rpc.messages;
 
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import java.io.Serializable;
+import org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeSerializer;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
+import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
+/**
+ * @author tony
+ *
+ */
 public class ExecuteRpc implements Serializable {
     private static final long serialVersionUID = 1128904894827335676L;
 
-    private final String inputCompositeNode;
+    private final NormalizedNodeMessages.Node inputNormalizedNode;
     private final QName rpc;
 
-    public ExecuteRpc(final String inputCompositeNode, final QName rpc) {
-        Preconditions.checkNotNull(inputCompositeNode, "Composite Node input string should be present");
+    private ExecuteRpc(final NormalizedNodeMessages.Node inputNormalizedNode, final QName rpc) {
         Preconditions.checkNotNull(rpc, "rpc Qname should not be null");
 
-        this.inputCompositeNode = inputCompositeNode;
+        this.inputNormalizedNode = inputNormalizedNode;
         this.rpc = rpc;
     }
 
-    public String getInputCompositeNode() {
-        return inputCompositeNode;
+    public NormalizedNodeMessages.Node getInputNormalizedNode() {
+        return inputNormalizedNode;
     }
 
     public QName getRpc() {
         return rpc;
     }
+
+    public static ExecuteRpc from(final DOMRpcIdentifier rpc, final NormalizedNode<?, ?> input) {
+        final Node serializedInput;
+        if(input != null) {
+            serializedInput = NormalizedNodeSerializer.serialize(input);
+        } else {
+            serializedInput = null;
+        }
+        return new ExecuteRpc(serializedInput, rpc.getType().getLastComponent());
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this)
+                .add("rpc", rpc)
+                .add("normalizedNode", inputNormalizedNode)
+                .toString();
+    }
 }