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=a9bdd2d5ba040526eca39ad07607119d1d0480b8;hp=a4587fa787fdff3af7b5dedab4b22505375fe37c;hpb=d6e3e28bf86638685e55289d6cd9cb749838a75e;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 a4587fa787..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,13 +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.controller.md.sal.common.api.TransactionStatus -import javax.ws.rs.WebApplicationException +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 { @@ -50,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 @@ -60,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 @@ -69,16 +79,21 @@ 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) { val instanceIdentifierWithSchemaNode = identifier.resolveInstanceIdentifier - val data = broker.readOperationalData(instanceIdentifierWithSchemaNode.getInstanceIdentifier); + val data = broker.readConfigurationData(instanceIdentifierWithSchemaNode.getInstanceIdentifier); return new StructuredData(data, instanceIdentifierWithSchemaNode.schemaNode) } @@ -96,54 +111,95 @@ class RestconfImpl implements RestconfService { createConfigurationData(identifier,payload); } - override createOperationalData(String identifier, CompositeNode payload) { - val identifierWithSchemaNode = identifier.resolveInstanceIdentifier - val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode) - val status = broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); - switch status.result { - case TransactionStatus.COMMITED: Response.status(Response.Status.OK).build - default: Response.status(Response.Status.INTERNAL_SERVER_ERROR).build - } - } - - override updateOperationalData(String identifier, CompositeNode payload) { - val identifierWithSchemaNode = identifier.resolveInstanceIdentifier - val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode) - val status = broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); - switch status.result { - case TransactionStatus.COMMITED: Response.status(Response.Status.NO_CONTENT).build - default: Response.status(Response.Status.INTERNAL_SERVER_ERROR).build - } - } - private def InstanceIdWithSchemaNode resolveInstanceIdentifier(String identifier) { val identifierWithSchemaNode = identifier.toInstanceIdentifier if (identifierWithSchemaNode === null) { - throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST).entity("URI has bad format") - .build()); + throw new ResponseException(Response.Status.BAD_REQUEST, "URI has bad format"); } 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) { - if (nodeBuilder.namespace === null) { - nodeBuilder.namespace = schema.QName.namespace + 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."); + } + 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 = 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, - (schema as DataNodeContainer).childNodes.findFirst[n|n.QName.localName.equals(child.localName)]) + 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) { + for (caze : (schema as ChoiceNode).cases) { + val result = findFirstSchemaByLocalName(localName, caze.childNodes) + if (result !== null) { + return result + } + } + } else { + val result = schemas.findFirst[n|n.QName.localName.equals(localName)] + if(result !== null) { + return result; + + } } } + return null } }