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%2FControllerContext.xtend;h=400850103d7be35f72beeb39088a1618a23feff5;hb=13efd0b8e167e8aadd531b5ec0e72572a72bc249;hp=49b997fa50f5b75767dc368923cf3c4b159ac3c6;hpb=ec885a4eba20a0b75fb74f93535398da75d43e48;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend index 49b997fa50..400850103d 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend @@ -24,29 +24,72 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode import org.opendaylight.yangtools.yang.model.api.SchemaContext import static com.google.common.base.Preconditions.* +import org.opendaylight.controller.sal.core.api.model.SchemaServiceListener +import org.opendaylight.yangtools.yang.model.api.RpcDefinition +import java.util.concurrent.ConcurrentHashMap -class ControllerContext { +class ControllerContext implements SchemaServiceListener { + + val static ControllerContext INSTANCE = new ControllerContext + + val static NULL_VALUE = "null" @Property SchemaContext schemas; private val BiMap uriToModuleName = HashBiMap.create(); private val Map moduleNameToUri = uriToModuleName.inverse(); + private val Map qnameToRpc = new ConcurrentHashMap(); + + + private new() { + if (INSTANCE != null) { + throw new IllegalStateException("Already instantiated"); + } + } + + static def getInstance() { + return INSTANCE + } public def InstanceIdWithSchemaNode toInstanceIdentifier(String restconfInstance) { val ret = InstanceIdentifier.builder(); val pathArgs = restconfInstance.split("/"); + if (pathArgs.empty) { + return null; + } + if (pathArgs.head.empty) { + pathArgs.remove(0) + } val schemaNode = ret.collectPathArguments(pathArgs, restconfInstance.findModule); + if (schemaNode == null) { + return null + } new InstanceIdWithSchemaNode(ret.toInstance, schemaNode) } - - def findModule(String restconfInstance) { + + private def findModule(String restconfInstance) { + checkNotNull(restconfInstance); val pathArgs = restconfInstance.split("/"); - val first = pathArgs.get(0); - val startModule = first.toModuleName(); - val module = schemas.findModuleByNamespace(moduleNameToUri.get(startModule)); - checkArgument(module.size == 1); // Only one version supported now - module.iterator.next + if (pathArgs.empty) { + return null; + } + val modulWithFirstYangStatement = pathArgs.filter[s|s.contains(":")].head + val startModule = modulWithFirstYangStatement.toModuleName(); + schemas.getLatestModule(startModule) + } + + private def getLatestModule(SchemaContext schema, String moduleName) { + checkNotNull(schema) + checkArgument(moduleName != null && !moduleName.empty) + val modules = schema.modules.filter[m|m.name == moduleName] + var latestModule = modules.head + for (module : modules) { + if (module.revision.after(latestModule.revision)) { + latestModule = module + } + } + return latestModule } def String toFullRestconfIdentifier(InstanceIdentifier path) { @@ -76,7 +119,7 @@ class ControllerContext { throw new IllegalArgumentException("Conversion of generic path argument is not supported"); } - public def CharSequence toRestconfIdentifier(QName qname) { + def CharSequence toRestconfIdentifier(QName qname) { var module = uriToModuleName.get(qname.namespace) if (module == null) { val moduleSchema = schemas.findModuleByNamespaceAndRevision(qname.namespace, qname.revision); @@ -137,34 +180,54 @@ class ControllerContext { return URLEncoder.encode(object.toString) } - def DataSchemaNode collectPathArguments(InstanceIdentifierBuilder builder, List strings, DataNodeContainer parentNode) { + private def DataSchemaNode collectPathArguments(InstanceIdentifierBuilder builder, List strings, + DataNodeContainer parentNode) { checkNotNull(strings) - if (strings.length == 0) { - return null; + if (strings.empty) { + return parentNode as DataSchemaNode; } - val nodeRef = strings.get(0); + val nodeRef = strings.head; - //val moduleName = nodeRef.toModuleName(); val nodeName = nodeRef.toNodeName(); - val naiveTargetNode = parentNode.getDataChildByName(nodeName); - - //var URI namespace; - var DataSchemaNode targetNode = naiveTargetNode; + val targetNode = parentNode.getDataChildByName(nodeName); + if (targetNode == null) { + val children = parentNode.childNodes + for (child : children) { + if (child instanceof ChoiceNode) { + val choice = child as ChoiceNode + for (caze : choice.cases) { + val result = builder.collectPathArguments(strings, caze as DataNodeContainer); + if (result != null) + return result + } + } + } + return null + } + if (targetNode instanceof ChoiceNode) { + return null + } - /*if(moduleName !== null) { - namespace = moduleNameToUri.get(moduleName); - - }*/ // Number of consumed elements var consumed = 1; if (targetNode instanceof ListSchemaNode) { val listNode = targetNode as ListSchemaNode; val keysSize = listNode.keyDefinition.size - val uriKeyValues = strings.subList(1, keysSize); + + // every key has to be filled + if ((strings.length - consumed) < keysSize) { + return null; + } + val uriKeyValues = strings.subList(consumed, consumed + keysSize); val keyValues = new HashMap(); var i = 0; for (key : listNode.keyDefinition) { val uriKeyValue = uriKeyValues.get(i); + + // key value cannot be NULL + if (uriKeyValue.equals(NULL_VALUE)) { + return null + } keyValues.addKeyValue(listNode.getDataChildByName(key), uriKeyValue); i = i + 1; } @@ -176,15 +239,15 @@ class ControllerContext { builder.node(targetNode.QName); } if (targetNode instanceof DataNodeContainer) { - val remaining = strings.subList(consumed, strings.length - 1); + val remaining = strings.subList(consumed, strings.length); val result = builder.collectPathArguments(remaining, targetNode as DataNodeContainer); return result } - + return targetNode } - def void addKeyValue(HashMap map, DataSchemaNode node, String uriValue) { + private def void addKeyValue(HashMap map, DataSchemaNode node, String uriValue) { checkNotNull(uriValue); checkArgument(node instanceof LeafSchemaNode); val decoded = URLDecoder.decode(uriValue); @@ -192,7 +255,8 @@ class ControllerContext { } - def String toModuleName(String str) { + private def String toModuleName(String str) { + checkNotNull(str) if (str.contains(":")) { val args = str.split(":"); checkArgument(args.size === 2); @@ -202,7 +266,7 @@ class ControllerContext { } } - def String toNodeName(String str) { + private def String toNodeName(String str) { if (str.contains(":")) { val args = str.split(":"); checkArgument(args.size === 2); @@ -211,9 +275,24 @@ class ControllerContext { return str; } } + + public def QName toQName(String name) { + val module = name.toModuleName; + val node = name.toNodeName; + val namespace = moduleNameToUri.get(module); + return new QName(namespace,null,node); + } + + override onGlobalContextUpdated(SchemaContext context) { + this.schemas = context; + for(operation : context.operations) { + val qname = new QName(operation.QName.namespace,null,operation.QName.localName); + qnameToRpc.put(qname,operation); + } + } - public def QName toRpcQName(String name) { - - + def ContainerSchemaNode getRpcOutputSchema(QName name) { + qnameToRpc.get(name)?.output; } + }