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=35352e0819c9720d4bc23e80f30437b542351633;hb=e640f23d9c37afac9ca51f48e155302bc65327ed;hp=b7307544397b06e4bf544a71b0fd59471cfa72fd;hpb=1720ef0759ca8d7ff96bc82563f7673d68a20377;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 b730754439..35352e0819 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,14 +1,23 @@ package org.opendaylight.controller.sal.restconf.impl +import java.util.ArrayList import java.util.List import java.util.Set import javax.ws.rs.core.Response import org.opendaylight.controller.md.sal.common.api.TransactionStatus import org.opendaylight.controller.sal.rest.api.RestconfService import org.opendaylight.yangtools.yang.data.api.CompositeNode +import org.opendaylight.yangtools.yang.data.api.Node +import org.opendaylight.yangtools.yang.data.impl.NodeFactory import org.opendaylight.yangtools.yang.model.api.ChoiceNode import org.opendaylight.yangtools.yang.model.api.DataNodeContainer import org.opendaylight.yangtools.yang.model.api.DataSchemaNode +import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec +import org.opendaylight.yangtools.yang.model.api.TypeDefinition +import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode +import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode +import org.opendaylight.yangtools.yang.common.QName +import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode class RestconfImpl implements RestconfService { @@ -51,7 +60,7 @@ class RestconfImpl implements RestconfService { override createConfigurationData(String identifier, CompositeNode payload) { val identifierWithSchemaNode = identifier.resolveInstanceIdentifier - val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode) + val value = normalizeNode(payload, identifierWithSchemaNode.schemaNode) val status = broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); switch status.result { case TransactionStatus.COMMITED: Response.status(Response.Status.OK).build @@ -61,7 +70,7 @@ class RestconfImpl implements RestconfService { override updateConfigurationData(String identifier, CompositeNode payload) { val identifierWithSchemaNode = identifier.resolveInstanceIdentifier - val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode) + val value = normalizeNode(payload, identifierWithSchemaNode.schemaNode) val status = broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); switch status.result { case TransactionStatus.COMMITED: Response.status(Response.Status.NO_CONTENT).build @@ -70,11 +79,16 @@ class RestconfImpl implements RestconfService { } override invokeRpc(String identifier, CompositeNode payload) { - val rpc = identifier.toQName; - val value = resolveNodeNamespaceBySchema(payload, controllerContext.getRpcInputSchema(rpc)) - val rpcResult = broker.invokeRpc(rpc, value); - val schema = controllerContext.getRpcOutputSchema(rpc); - return new StructuredData(rpcResult.result, schema); + val rpc = identifier.rpcDefinition + if (rpc === null) { + throw new ResponseException(Response.Status.NOT_FOUND, "RPC does not exist."); + } + val value = normalizeNode(payload, rpc.input) + val List> input = new ArrayList + input.add(value) + val rpcRequest = NodeFactory.createMutableCompositeNode(rpc.QName, null, input, null, null) + val rpcResult = broker.invokeRpc(rpc.QName, rpcRequest); + return new StructuredData(rpcResult.result, rpc.output); } override readConfigurationData(String identifier) { @@ -105,38 +119,69 @@ class RestconfImpl implements RestconfService { return identifierWithSchemaNode } - private def CompositeNode resolveNodeNamespaceBySchema(CompositeNode node, DataSchemaNode schema) { + private def CompositeNode normalizeNode(CompositeNode node, DataSchemaNode schema) { if (node instanceof CompositeNodeWrapper) { - addNamespaceToNodeFromSchemaRecursively(node as CompositeNodeWrapper, schema) - return (node as CompositeNodeWrapper).unwrap(null) + normalizeNode(node as CompositeNodeWrapper, schema,null) + return (node as CompositeNodeWrapper).unwrap() } return node } - private def void addNamespaceToNodeFromSchemaRecursively(NodeWrapper nodeBuilder, DataSchemaNode schema) { + private def void normalizeNode(NodeWrapper nodeBuilder, DataSchemaNode schema,QName previousAugment) { if (schema === null) { throw new ResponseException(Response.Status.BAD_REQUEST, "Data has bad format\n" + nodeBuilder.localName + " does not exist in yang schema."); } - val moduleName = controllerContext.findModuleByNamespace(schema.QName.namespace); - if (nodeBuilder.namespace === null || nodeBuilder.namespace == schema.QName.namespace || + var validQName = schema.QName + var currentAugment = previousAugment; + if(schema.augmenting) { + currentAugment = schema.QName + } else if(previousAugment !== null && schema.QName.namespace !== previousAugment.namespace) { + validQName = QName.create(currentAugment,schema.QName.localName); + } + val moduleName = controllerContext.findModuleByNamespace(validQName.namespace); + if (nodeBuilder.namespace === null || nodeBuilder.namespace == validQName.namespace || nodeBuilder.namespace.path == moduleName) { - nodeBuilder.qname = schema.QName + nodeBuilder.qname = validQName } else { throw new ResponseException(Response.Status.BAD_REQUEST, "Data has bad format\nIf data is in XML format then namespace for " + nodeBuilder.localName + " should be " + schema.QName.namespace + ".\n If data is in Json format then module name for " + nodeBuilder.localName + " should be " + moduleName + "."); } + if (nodeBuilder instanceof CompositeNodeWrapper) { val List> children = (nodeBuilder as CompositeNodeWrapper).getValues for (child : children) { - addNamespaceToNodeFromSchemaRecursively(child, - findFirstSchemaByLocalName(child.localName, (schema as DataNodeContainer).childNodes)) + normalizeNode(child, + findFirstSchemaByLocalName(child.localName, (schema as DataNodeContainer).childNodes),currentAugment) + } + } else if (nodeBuilder instanceof SimpleNodeWrapper) { + val simpleNode = (nodeBuilder as SimpleNodeWrapper) + val stringValue = simpleNode.value as String; + + val objectValue = TypeDefinitionAwareCodec.from(schema.typeDefinition)?.deserialize(stringValue); + simpleNode.setValue(objectValue) + } else if (nodeBuilder instanceof EmptyNodeWrapper) { + val emptyNodeBuilder = nodeBuilder as EmptyNodeWrapper + if(schema instanceof LeafSchemaNode) { + emptyNodeBuilder.setComposite(false); + } else if(schema instanceof ContainerSchemaNode) { + // FIXME: Add presence check + emptyNodeBuilder.setComposite(true); } } } + private def dispatch TypeDefinition typeDefinition(LeafSchemaNode node) { + node.type + } + + private def dispatch TypeDefinition typeDefinition(LeafListSchemaNode node) { + node.type + } + + private def DataSchemaNode findFirstSchemaByLocalName(String localName, Set schemas) { for (schema : schemas) { if (schema instanceof ChoiceNode) { @@ -147,7 +192,11 @@ class RestconfImpl implements RestconfService { } } } else { - return schemas.findFirst[n|n.QName.localName.equals(localName)] + val result = schemas.findFirst[n|n.QName.localName.equals(localName)] + if(result !== null) { + return result; + + } } } return null