From c179907a72ee2592689f8ab5425d66712d64efc2 Mon Sep 17 00:00:00 2001 From: Vaclav Demcak Date: Tue, 12 May 2015 10:56:04 +0200 Subject: [PATCH] Bug 3216 - Restconf GET operations functionality are not supported yet * missing list of all operations for all modules or for some module Change-Id: I937890b83fe2bf3198278123373c5d3bad0aa927 Signed-off-by: Vaclav Demcak (cherry picked from commit a59286ee063c90817958e9cef4836e15aec3c7a6) --- .../sal/restconf/impl/RestconfImpl.java | 70 ++++++++++++++++++- .../impl/test/RestGetOperationTest.java | 50 +++---------- 2 files changed, 75 insertions(+), 45 deletions(-) diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java index 67ecf56ba4..c329f525a9 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.sal.restconf.impl; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -25,6 +26,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -66,6 +68,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; +import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; @@ -89,7 +92,13 @@ 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.SchemaPath; +import org.opendaylight.yangtools.yang.model.util.EmptyType; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; +import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder; +import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBuilder; +import org.opendaylight.yangtools.yang.parser.builder.impl.LeafSchemaNodeBuilder; +import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder; +import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -322,12 +331,67 @@ public class RestconfImpl implements RestconfService { return operationsFromModulesToNormalizedContext(modules, mountPoint); } + private static final Predicate GROUPING_FILTER = new Predicate() { + @Override + public boolean apply(final GroupingBuilder g) { + return Draft02.RestConfModule.RESTCONF_GROUPING_SCHEMA_NODE.equals(g.getQName().getLocalName()); + } + }; + private NormalizedNodeContext operationsFromModulesToNormalizedContext(final Set modules, final DOMMountPoint mountPoint) { - // FIXME find best way to change restconf-netconf yang schema for provide this functionality - final String errMsg = "We are not able support view operations functionality yet."; - throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.OPERATION_NOT_SUPPORTED); + final Module restconfModule = getRestconfModule(); + final ModuleBuilder restConfModuleBuilder = new ModuleBuilder(restconfModule); + final Set gropingBuilders = restConfModuleBuilder.getGroupingBuilders(); + final Iterable filteredGroups = Iterables.filter(gropingBuilders, GROUPING_FILTER); + final GroupingBuilder restconfGroupingBuilder = Iterables.getFirst(filteredGroups, null); + final ContainerSchemaNodeBuilder restContainerSchemaNodeBuilder = (ContainerSchemaNodeBuilder) restconfGroupingBuilder + .getDataChildByName(Draft02.RestConfModule.RESTCONF_CONTAINER_SCHEMA_NODE); + final ContainerSchemaNodeBuilder containerSchemaNodeBuilder = (ContainerSchemaNodeBuilder) restContainerSchemaNodeBuilder + .getDataChildByName(Draft02.RestConfModule.OPERATIONS_CONTAINER_SCHEMA_NODE); + + final ContainerSchemaNodeBuilder fakeOperationsSchemaNodeBuilder = containerSchemaNodeBuilder; + final SchemaPath fakeSchemaPath = fakeOperationsSchemaNodeBuilder.getPath().createChild(QName.create("dummy")); + + final List> operationsAsData = new ArrayList<>(); + + for (final Module module : modules) { + final Set rpcs = module.getRpcs(); + for (final RpcDefinition rpc : rpcs) { + final QName rpcQName = rpc.getQName(); + final String name = module.getName(); + + final QName qName = QName.create(restconfModule.getQNameModule(), rpcQName.getLocalName()); + final LeafSchemaNodeBuilder leafSchemaNodeBuilder = new LeafSchemaNodeBuilder(name, 0, qName, fakeSchemaPath); + final LeafSchemaNodeBuilder fakeRpcSchemaNodeBuilder = leafSchemaNodeBuilder; + fakeRpcSchemaNodeBuilder.setAugmenting(true); + + final EmptyType instance = EmptyType.getInstance(); + fakeRpcSchemaNodeBuilder.setType(instance); + final LeafSchemaNode fakeRpcSchemaNode = fakeRpcSchemaNodeBuilder.build(); + fakeOperationsSchemaNodeBuilder.addChildNode(fakeRpcSchemaNode); + + final LeafNode leaf = Builders.leafBuilder(fakeRpcSchemaNode).build(); + operationsAsData.add(leaf); + } + } + + final ContainerSchemaNode operContainerSchemaNode = fakeOperationsSchemaNodeBuilder.build(); + final DataContainerNodeAttrBuilder operContainerNode = Builders.containerBuilder(operContainerSchemaNode); + + for (final LeafNode oper : operationsAsData) { + operContainerNode.withChild(oper); + } + + final Set fakeRpcModules = Collections.singleton(restConfModuleBuilder.build()); + + final YangParserImpl yangParser = new YangParserImpl(); + final SchemaContext fakeSchemaCx = yangParser.resolveSchemaContext(fakeRpcModules); + + final InstanceIdentifierContext fakeIICx = new InstanceIdentifierContext<>(null, operContainerSchemaNode, mountPoint, fakeSchemaCx); + + return new NormalizedNodeContext(fakeIICx, operContainerNode.build()); } private Module getRestconfModule() { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java index 1dc5d672f3..eb7ea71bf4 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java @@ -17,7 +17,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import com.google.common.base.Optional; import com.google.common.collect.Maps; import java.io.FileNotFoundException; @@ -313,7 +312,6 @@ public class RestGetOperationTest extends JerseyTest { // /operations @Test - @Ignore // FIXME restconf-netconf yang schema has to be updated for operations container public void getOperationsTest() throws FileNotFoundException, UnsupportedEncodingException { setControllerContext(schemaContextModules); @@ -339,32 +337,26 @@ public class RestGetOperationTest extends JerseyTest { } private void validateOperationsResponseXml(final Document responseDoc, final SchemaContext schemaContext) { + final Element operationsElem = responseDoc.getDocumentElement(); assertEquals(RESTCONF_NS, operationsElem.getNamespaceURI()); assertEquals("operations", operationsElem.getLocalName()); - - final HashSet foundOperations = new HashSet<>(); - final NodeList operationsList = operationsElem.getChildNodes(); - for(int i = 0;i < operationsList.getLength();i++) { - final org.w3c.dom.Node operation = operationsList.item(i); + final HashSet foundOperations = new HashSet<>(); - final String namespace = operation.getNamespaceURI(); - final String name = operation.getLocalName(); - final QName opQName = QName.create(URI.create(namespace), null, name); - foundOperations.add(opQName); + for (int i = 0; i < operationsList.getLength(); i++) { + final org.w3c.dom.Node operation = operationsList.item(i); + foundOperations.add(operation.getLocalName()); } - for(final RpcDefinition schemaOp : schemaContext.getOperations()) { - assertTrue(foundOperations.contains(schemaOp.getQName().withoutRevision())); + for (final RpcDefinition schemaOp : schemaContext.getOperations()) { + assertTrue(foundOperations.contains(schemaOp.getQName().getLocalName())); } - } // /operations/pathToMountPoint/yang-ext:mount @Test - @Ignore // FIXME fix the way to provide operations overview functionality asap public void getOperationsBehindMountPointTest() throws FileNotFoundException, UnsupportedEncodingException { setControllerContext(schemaContextModules); @@ -395,33 +387,7 @@ public class RestGetOperationTest extends JerseyTest { private Matcher validateOperationsResponseJson(final String searchIn, final String rpcName, final String moduleName) { final StringBuilder regex = new StringBuilder(); - regex.append("^"); - - regex.append(".*\\{"); - regex.append(".*\""); - - // operations prefix optional - regex.append("("); - regex.append("ietf-restconf:"); - regex.append("|)"); - // :operations prefix optional - - regex.append("operations\""); - regex.append(".*:"); - regex.append(".*\\{"); - - regex.append(".*\"" + moduleName); - regex.append(":"); - regex.append(rpcName + "\""); - regex.append(".*\\["); - regex.append(".*null"); - regex.append(".*\\]"); - - regex.append(".*\\}"); - regex.append(".*\\}"); - - regex.append(".*"); - regex.append("$"); + regex.append(".*\"" + rpcName + "\""); final Pattern ptrn = Pattern.compile(regex.toString(), Pattern.DOTALL); return ptrn.matcher(searchIn); -- 2.36.6