Merge "Fix errors reported by pyang"

[controller.git] / opendaylight / md-sal / sal-netconf-connector / src / main / java / org / opendaylight / controller / sal / connect / netconf / NetconfMapping.xtend

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfMapping.xtend b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfMapping.xtend
index d23ec1cd61ae65ee507693638e03be9043b3e937..78f6d59f77ed2b2a7025b578d6090929ceead2dd 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfMapping.xtend
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfMapping.xtend
@@ -18,6 +18,8 @@ import java.util.concurrent.atomic.AtomicInteger
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import org.opendaylight.controller.sal.common.util.Rpcs
+import java.util.List
+import com.google.common.collect.ImmutableList
 
 class NetconfMapping {
 
@@ -26,12 +28,18 @@ class NetconfMapping {
     public static val NETCONF_RPC_QNAME = new QName(NETCONF_QNAME,"rpc");
     public static val NETCONF_GET_QNAME = new QName(NETCONF_QNAME,"get");
     public static val NETCONF_GET_CONFIG_QNAME = new QName(NETCONF_QNAME,"get-config");
+    public static val NETCONF_SOURCE_QNAME = new QName(NETCONF_QNAME,"source");
+    public static val NETCONF_RUNNING_QNAME = new QName(NETCONF_QNAME,"running");
     public static val NETCONF_RPC_REPLY_QNAME = new QName(NETCONF_QNAME,"rpc-reply");
     public static val NETCONF_OK_QNAME = new QName(NETCONF_QNAME,"ok");
     public static val NETCONF_DATA_QNAME = new QName(NETCONF_QNAME,"data");
     
+     static List<Node<?>> RUNNING = Collections.<Node<?>>singletonList(new SimpleNodeTOImpl(NETCONF_RUNNING_QNAME,null,null));
+    public static val CONFIG_SOURCE_RUNNING = new CompositeNodeTOImpl(NETCONF_SOURCE_QNAME,null,RUNNING);
 
     static val messageId = new AtomicInteger(0);
+    
+   
 
 
 
@@ -88,6 +96,15 @@ class NetconfMapping {
         }
     }
     
+        static def wrap(QName name,Node<?> additional,Node<?> node) {
+        if(node != null) {
+            return new CompositeNodeTOImpl(name,null,ImmutableList.of(additional,node));
+        }
+        else {
+            return new CompositeNodeTOImpl(name,null,ImmutableList.of(additional));
+        }
+    }
+    
     
     public static def Node<?> toCompositeNode(Document document) {
         return XmlDocumentUtils.toCompositeNode(document) as Node<?>