X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2FRestconfImpl.xtend;h=ea3a4fbcfcbae90e848c39e505008dd701613b26;hb=d8654e1e998855eb4a24af909c35b760e7a7c79b;hp=31fbe8ec876876b0d677ffaa90df95fddbdfa91a;hpb=05d3c60109c1d0fc24f0f1ffa3e5aeed929e3c24;p=controller.git

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend
index 31fbe8ec87..ea3a4fbcfc 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend
@@ -1,7 +1,10 @@
 package org.opendaylight.controller.sal.restconf.impl
 
-import org.opendaylight.yangtools.yang.data.api.CompositeNode
+import java.util.List
 import org.opendaylight.controller.sal.rest.api.RestconfService
+import org.opendaylight.yangtools.yang.data.api.CompositeNode
+import org.opendaylight.yangtools.yang.model.api.DataNodeContainer
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode
 
 class RestconfImpl implements RestconfService {
     
@@ -44,17 +47,20 @@ class RestconfImpl implements RestconfService {
 
     override createConfigurationData(String identifier, CompositeNode payload) {
         val identifierWithSchemaNode = identifier.toInstanceIdentifier
-        return broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,payload).get();
+        val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode)
+        return broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,value).get();
     }
 
     override updateConfigurationData(String identifier, CompositeNode payload) {
         val identifierWithSchemaNode = identifier.toInstanceIdentifier
-        return broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,payload).get();
+        val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode)
+        return broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,value).get();
     }
 
     override invokeRpc(String identifier, CompositeNode payload) {
         val rpc = identifier.toQName;
-        val rpcResult = broker.invokeRpc(rpc, payload);
+        val value = resolveNodeNamespaceBySchema(payload, controllerContext.getRpcInputSchema(rpc))
+        val rpcResult = broker.invokeRpc(rpc, value);
         val schema = controllerContext.getRpcOutputSchema(rpc);
         return new StructuredData(rpcResult.result, schema);
     }
@@ -81,12 +87,35 @@ class RestconfImpl implements RestconfService {
     
     override createOperationalData(String identifier, CompositeNode payload) {
         val identifierWithSchemaNode = identifier.toInstanceIdentifier
-        return broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,payload).get();
+        val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode)
+        return broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,value).get();
     }
     
     override updateOperationalData(String identifier, CompositeNode payload) {
         val identifierWithSchemaNode = identifier.toInstanceIdentifier
-        return broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,payload).get();
+        val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode)
+        return broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,value).get();
+    }
+    
+    private def CompositeNode resolveNodeNamespaceBySchema(CompositeNode node, DataSchemaNode schema) {
+        if (node instanceof CompositeNodeWrapper) {
+            addNamespaceToNodeFromSchemaRecursively(node as CompositeNodeWrapper, schema)
+            return (node as CompositeNodeWrapper).unwrap(null)
+        }
+        return node
+    }
+
+    private def void addNamespaceToNodeFromSchemaRecursively(NodeWrapper<?> nodeBuilder, DataSchemaNode schema) {
+        if (nodeBuilder.namespace == null) {
+            nodeBuilder.namespace = schema.QName.namespace
+        }
+        if (nodeBuilder instanceof CompositeNodeWrapper) {
+            val List<NodeWrapper<?>> children = (nodeBuilder as CompositeNodeWrapper).getValues
+            for (child : children) {
+                addNamespaceToNodeFromSchemaRecursively(child,
+                    (schema as DataNodeContainer).childNodes.findFirst[n|n.QName.localName === child.localName])
+            }
+        }
     }
 
 }