X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2FControllerContext.xtend;h=470b4735a441ad7b5f3e8f421c53fea904d033d3;hp=2b3a3042c2ce9119c9ee9d0176dcf88ed52807cb;hb=1e2d8181c7178f322a01bb02f0a1c7d52a391a66;hpb=71122c533df3457035350b561362f5601d171780 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 2b3a3042c2..470b4735a4 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 @@ -8,6 +8,10 @@ import java.net.URLEncoder import java.util.HashMap import java.util.List import java.util.Map +import java.util.concurrent.ConcurrentHashMap +import javax.ws.rs.core.Response +import org.opendaylight.controller.sal.core.api.model.SchemaServiceListener +import org.opendaylight.controller.sal.rest.impl.RestconfProvider import org.opendaylight.yangtools.yang.common.QName import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.InstanceIdentifierBuilder @@ -21,10 +25,13 @@ import org.opendaylight.yangtools.yang.model.api.DataNodeContainer import org.opendaylight.yangtools.yang.model.api.DataSchemaNode import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode import org.opendaylight.yangtools.yang.model.api.ListSchemaNode +import org.opendaylight.yangtools.yang.model.api.RpcDefinition import org.opendaylight.yangtools.yang.model.api.SchemaContext +import org.opendaylight.yangtools.yang.model.api.SchemaNode +import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition +import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil import static com.google.common.base.Preconditions.* -import org.opendaylight.controller.sal.core.api.model.SchemaServiceListener class ControllerContext implements SchemaServiceListener { @@ -32,14 +39,14 @@ class ControllerContext implements SchemaServiceListener { val static NULL_VALUE = "null" - @Property - SchemaContext schemas; + var 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) { + if (INSTANCE !== null) { throw new IllegalStateException("Already instantiated"); } } @@ -48,6 +55,16 @@ class ControllerContext implements SchemaServiceListener { return INSTANCE } + private def void checkPreconditions() { + if (schemas === null) { + throw new ResponseException(Response.Status.SERVICE_UNAVAILABLE, RestconfProvider::NOT_INITALIZED_MSG) + } + } + + def setSchemas(SchemaContext schemas) { + onGlobalContextUpdated(schemas) + } + public def InstanceIdWithSchemaNode toInstanceIdentifier(String restconfInstance) { val ret = InstanceIdentifier.builder(); val pathArgs = restconfInstance.split("/"); @@ -58,13 +75,14 @@ class ControllerContext implements SchemaServiceListener { pathArgs.remove(0) } val schemaNode = ret.collectPathArguments(pathArgs, restconfInstance.findModule); - if (schemaNode == null) { + if (schemaNode === null) { return null } - new InstanceIdWithSchemaNode(ret.toInstance, schemaNode) + return new InstanceIdWithSchemaNode(ret.toInstance, schemaNode) } private def findModule(String restconfInstance) { + checkPreconditions checkNotNull(restconfInstance); val pathArgs = restconfInstance.split("/"); if (pathArgs.empty) { @@ -72,13 +90,13 @@ class ControllerContext implements SchemaServiceListener { } val modulWithFirstYangStatement = pathArgs.filter[s|s.contains(":")].head val startModule = modulWithFirstYangStatement.toModuleName(); - schemas.getLatestModule(startModule) + return 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] + private def getLatestModule(String moduleName) { + checkPreconditions + checkArgument(moduleName !== null && !moduleName.empty) + val modules = schemas.modules.filter[m|m.name == moduleName] var latestModule = modules.head for (module : modules) { if (module.revision.after(latestModule.revision)) { @@ -89,6 +107,7 @@ class ControllerContext implements SchemaServiceListener { } def String toFullRestconfIdentifier(InstanceIdentifier path) { + checkPreconditions val elements = path.path; val ret = new StringBuilder(); val startQName = elements.get(0).nodeType; @@ -115,11 +134,31 @@ class ControllerContext implements SchemaServiceListener { throw new IllegalArgumentException("Conversion of generic path argument is not supported"); } + def findModuleByNamespace(URI namespace) { + checkPreconditions + var module = uriToModuleName.get(namespace) + if (module === null) { + val moduleSchemas = schemas.findModuleByNamespace(namespace); + if(moduleSchemas === null) throw new IllegalArgumentException() + var latestModule = moduleSchemas.head + for (m : moduleSchemas) { + if (m.revision.after(latestModule.revision)) { + latestModule = m + } + } + if(latestModule === null) throw new IllegalArgumentException() + uriToModuleName.put(namespace, latestModule.name) + module = latestModule.name; + } + return module + } + def CharSequence toRestconfIdentifier(QName qname) { + checkPreconditions var module = uriToModuleName.get(qname.namespace) - if (module == null) { + if (module === null) { val moduleSchema = schemas.findModuleByNamespaceAndRevision(qname.namespace, qname.revision); - if(moduleSchema == null) throw new IllegalArgumentException() + if(moduleSchema === null) throw new IllegalArgumentException() uriToModuleName.put(qname.namespace, moduleSchema.name) module = moduleSchema.name; } @@ -172,13 +211,16 @@ class ControllerContext implements SchemaServiceListener { } private def toUriString(Object object) { - if(object == null) return ""; + if(object === null) return ""; return URLEncoder.encode(object.toString) } private def DataSchemaNode collectPathArguments(InstanceIdentifierBuilder builder, List strings, DataNodeContainer parentNode) { checkNotNull(strings) + if (parentNode === null) { + return null; + } if (strings.empty) { return parentNode as DataSchemaNode; } @@ -186,14 +228,14 @@ class ControllerContext implements SchemaServiceListener { val nodeName = nodeRef.toNodeName(); val targetNode = parentNode.getDataChildByName(nodeName); - if (targetNode == null) { + 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) + if (result !== null) return result } } @@ -272,11 +314,54 @@ class ControllerContext implements SchemaServiceListener { } } - public def QName toRpcQName(String name) { + private def QName toQName(String name) { + val module = name.toModuleName; + val node = name.toNodeName; + val namespace = moduleNameToUri.get(module); + return new QName(namespace, null, node); + } + + def getRpcDefinition(String name) { + return qnameToRpc.get(name.toQName) } 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); + } } + /** + * Resolve target type from leafref type. + * + * According to RFC 6020 referenced element has to be leaf (chapter 9.9). + * Therefore if other element is referenced then null value is returned. + * + * Currently only cases without path-predicate are supported. + * + * @param leafRef + * @param schemaNode + * data schema node which contains reference + * @return type if leaf is referenced and it is possible to find referenced + * node in schema context. In other cases null value is returned + */ + def LeafSchemaNode resolveTypeFromLeafref(LeafrefTypeDefinition leafRef, DataSchemaNode schemaNode) { + val xPath = leafRef.getPathStatement(); + val module = SchemaContextUtil.findParentModule(schemas, schemaNode); + + var SchemaNode foundSchemaNode + if (xPath.isAbsolute()) { + foundSchemaNode = SchemaContextUtil.findDataSchemaNode(schemas, module, xPath); + } else { + foundSchemaNode = SchemaContextUtil.findDataSchemaNodeForRelativeXPath(schemas, module, schemaNode, xPath); + } + + if (foundSchemaNode instanceof LeafSchemaNode) { + return foundSchemaNode as LeafSchemaNode; + } + + return null; + } }