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.java;h=c329f525a952d162eb96c5ba960dc002ecf3f9cc;hb=a59286ee063c90817958e9cef4836e15aec3c7a6;hp=d912af20fe3d4344ba60b3a4d6950a711ae5c9a5;hpb=f84f3b8fb24b1ee2074fbbb3f5c64e3ba3191e3e;p=controller.git 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 d912af20fe..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,12 +10,14 @@ 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; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; @@ -25,7 +27,6 @@ import java.net.URISyntaxException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -50,6 +51,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMRpcException; import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult; +import org.opendaylight.controller.md.sal.rest.common.RestconfValidationUtils; import org.opendaylight.controller.sal.rest.api.Draft02; import org.opendaylight.controller.sal.rest.api.RestconfService; import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorTag; @@ -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; @@ -77,7 +80,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNo import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -90,9 +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.api.TypeDefinition; -import org.opendaylight.yangtools.yang.model.util.ExtendedType; +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; @@ -114,29 +120,19 @@ public class RestconfImpl implements RestconfService { } } - private static class TypeDef { - public final TypeDefinition typedef; - public final QName qName; - - TypeDef(final TypeDefinition typedef, final QName qName) { - this.typedef = typedef; - this.qName = qName; - } - } - - private final static RestconfImpl INSTANCE = new RestconfImpl(); + private static final RestconfImpl INSTANCE = new RestconfImpl(); private static final int NOTIFICATION_PORT = 8181; private static final int CHAR_NOT_FOUND = -1; - private final static String MOUNT_POINT_MODULE_NAME = "ietf-netconf"; + private static final String MOUNT_POINT_MODULE_NAME = "ietf-netconf"; - private final static SimpleDateFormat REVISION_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); + private static final SimpleDateFormat REVISION_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); - private final static String SAL_REMOTE_NAMESPACE = "urn:opendaylight:params:xml:ns:yang:controller:md:sal:remote"; + private static final String SAL_REMOTE_NAMESPACE = "urn:opendaylight:params:xml:ns:yang:controller:md:sal:remote"; - private final static String SAL_REMOTE_RPC_SUBSRCIBE = "create-data-change-event-subscription"; + private static final String SAL_REMOTE_RPC_SUBSRCIBE = "create-data-change-event-subscription"; private BrokerFacade broker; @@ -214,7 +210,7 @@ public class RestconfImpl implements RestconfService { Builders.containerBuilder((ContainerSchemaNode) modulesSchemaNode); moduleContainerBuilder.withChild(allModuleMap); - return new NormalizedNodeContext(new InstanceIdentifierContext(null, modulesSchemaNode, + return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, modulesSchemaNode, null, schemaContext), moduleContainerBuilder.build()); } @@ -230,10 +226,9 @@ public class RestconfImpl implements RestconfService { throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } - final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); + final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); final DOMMountPoint mountPoint = mountPointIdentifier.getMountPoint(); final Set modules = controllerContext.getAllModules(mountPoint); - final SchemaContext schemaContext = mountPoint.getSchemaContext(); final MapNode mountPointModulesMap = makeModuleMapNode(modules); final Module restconfModule = getRestconfModule(); @@ -245,8 +240,8 @@ public class RestconfImpl implements RestconfService { Builders.containerBuilder((ContainerSchemaNode) modulesSchemaNode); moduleContainerBuilder.withChild(mountPointModulesMap); - return new NormalizedNodeContext(new InstanceIdentifierContext(null, modulesSchemaNode, - mountPoint, schemaContext), moduleContainerBuilder.build()); + return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, modulesSchemaNode, + mountPoint, controllerContext.getGlobalSchema()), moduleContainerBuilder.build()); } @Override @@ -257,7 +252,7 @@ public class RestconfImpl implements RestconfService { DOMMountPoint mountPoint = null; final SchemaContext schemaContext; if (identifier.contains(ControllerContext.MOUNT)) { - final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); + final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); mountPoint = mountPointIdentifier.getMountPoint(); module = controllerContext.findModuleByNameAndRevision(mountPoint, moduleNameAndRevision); schemaContext = mountPoint.getSchemaContext(); @@ -280,7 +275,7 @@ public class RestconfImpl implements RestconfService { restconfModule, Draft02.RestConfModule.MODULE_LIST_SCHEMA_NODE); Preconditions.checkState(moduleSchemaNode instanceof ListSchemaNode); - return new NormalizedNodeContext(new InstanceIdentifierContext(null, moduleSchemaNode, mountPoint, + return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, moduleSchemaNode, mountPoint, schemaContext), moduleMap); } @@ -309,7 +304,7 @@ public class RestconfImpl implements RestconfService { streamsContainerBuilder.withChild(listStreamsBuilder.build()); - return new NormalizedNodeContext(new InstanceIdentifierContext(null, streamsContainerSchemaNode, null, + return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, streamsContainerSchemaNode, null, schemaContext), streamsContainerBuilder.build()); } @@ -324,7 +319,7 @@ public class RestconfImpl implements RestconfService { Set modules = null; DOMMountPoint mountPoint = null; if (identifier.contains(ControllerContext.MOUNT)) { - final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); + final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); mountPoint = mountPointIdentifier.getMountPoint(); modules = controllerContext.getAllModules(mountPoint); @@ -336,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() { @@ -433,18 +483,13 @@ public class RestconfImpl implements RestconfService { return retValue; } throw new RestconfDocumentedException("RpcError message", null, retValue.getErrors()); - } - catch (final InterruptedException e) { + } catch (final InterruptedException e) { throw new RestconfDocumentedException( "The operation was interrupted while executing and did not complete.", ErrorType.RPC, ErrorTag.PARTIAL_OPERATION); - } - catch (final ExecutionException e) { + } catch (final ExecutionException e) { Throwable cause = e.getCause(); - if (cause instanceof CancellationException) { - throw new RestconfDocumentedException("The operation was cancelled while executing.", ErrorType.RPC, - ErrorTag.PARTIAL_OPERATION); - } else if (cause != null) { + if (cause != null) { while (cause.getCause() != null) { cause = cause.getCause(); } @@ -460,6 +505,9 @@ public class RestconfImpl implements RestconfService { throw new RestconfDocumentedException("The operation encountered an unexpected error while executing.", e); } + } catch (final CancellationException e) { + throw new RestconfDocumentedException("The operation was cancelled while executing.", ErrorType.RPC, + ErrorTag.PARTIAL_OPERATION); } } @@ -540,7 +588,7 @@ public class RestconfImpl implements RestconfService { final SchemaContext schemaContext; if (identifier.contains(ControllerContext.MOUNT)) { // mounted RPC call - look up mount instance. - final InstanceIdentifierContext mountPointId = controllerContext.toMountPointIdentifier(identifier); + final InstanceIdentifierContext mountPointId = controllerContext.toMountPointIdentifier(identifier); mountPoint = mountPointId.getMountPoint(); schemaContext = mountPoint.getSchemaContext(); final int startOfRemoteRpcName = identifier.lastIndexOf(ControllerContext.MOUNT) @@ -597,7 +645,7 @@ public class RestconfImpl implements RestconfService { resultNodeSchema = rpcDataSchemaNode.getDataChildByName(result.getResult().getNodeType()); } - return new NormalizedNodeContext(new InstanceIdentifierContext(null, resultNodeSchema, mountPoint, + return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, resultNodeSchema, mountPoint, schemaContext), resultData); } @@ -622,7 +670,7 @@ public class RestconfImpl implements RestconfService { @Override public NormalizedNodeContext readConfigurationData(final String identifier, final UriInfo uriInfo) { - final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); final DOMMountPoint mountPoint = iiWithData.getMountPoint(); NormalizedNode data = null; final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); @@ -639,6 +687,8 @@ public class RestconfImpl implements RestconfService { return new NormalizedNodeContext(iiWithData, data); } + // FIXME: Move this to proper place + @SuppressWarnings("unused") private Integer parseDepthParameter(final UriInfo info) { final String param = info.getQueryParameters(false).getFirst(UriParameters.DEPTH.toString()); if (Strings.isNullOrEmpty(param) || "unbounded".equals(param)) { @@ -663,7 +713,7 @@ public class RestconfImpl implements RestconfService { @Override public NormalizedNodeContext readOperationalData(final String identifier, final UriInfo info) { - final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); final DOMMountPoint mountPoint = iiWithData.getMountPoint(); NormalizedNode data = null; final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); @@ -680,20 +730,14 @@ public class RestconfImpl implements RestconfService { return new NormalizedNodeContext(iiWithData, data); } - private boolean parsePrettyPrintParameter(final UriInfo info) { - final String param = info.getQueryParameters(false).getFirst(UriParameters.PRETTY_PRINT.toString()); - return Boolean.parseBoolean(param); - } - @Override public Response updateConfigurationData(final String identifier, final NormalizedNodeContext payload) { Preconditions.checkNotNull(identifier); - final InstanceIdentifierContext iiWithData = - (InstanceIdentifierContext) payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); validateInput(iiWithData.getSchemaNode(), payload); validateTopLevelNodeName(payload, iiWithData.getInstanceIdentifier()); - validateListKeysEqualityInPayloadAndUri(iiWithData, payload.getData()); + validateListKeysEqualityInPayloadAndUri(payload); final DOMMountPoint mountPoint = iiWithData.getMountPoint(); final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); @@ -717,7 +761,7 @@ public class RestconfImpl implements RestconfService { if (mountPoint != null) { broker.commitConfigurationDataPut(mountPoint, normalizedII, payload.getData()).checkedGet(); } else { - broker.commitConfigurationDataPut(normalizedII, payload.getData()).checkedGet(); + broker.commitConfigurationDataPut(controllerContext.getGlobalSchema(), normalizedII, payload.getData()).checkedGet(); } break; @@ -769,41 +813,38 @@ public class RestconfImpl implements RestconfService { * if key values or key count in payload and URI isn't equal * */ - private void validateListKeysEqualityInPayloadAndUri(final InstanceIdentifierContext iiWithData, - final NormalizedNode payload) { - if (iiWithData.getSchemaNode() instanceof ListSchemaNode) { - final List keyDefinitions = ((ListSchemaNode) iiWithData.getSchemaNode()).getKeyDefinition(); - final PathArgument lastPathArgument = iiWithData.getInstanceIdentifier().getLastPathArgument(); - if (lastPathArgument instanceof NodeIdentifierWithPredicates) { - final Map uriKeyValues = ((NodeIdentifierWithPredicates) lastPathArgument) - .getKeyValues(); - isEqualUriAndPayloadKeyValues(uriKeyValues, payload, keyDefinitions); + private static void validateListKeysEqualityInPayloadAndUri(final NormalizedNodeContext payload) { + Preconditions.checkArgument(payload != null); + final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); + final PathArgument lastPathArgument = iiWithData.getInstanceIdentifier().getLastPathArgument(); + final SchemaNode schemaNode = iiWithData.getSchemaNode(); + final NormalizedNode data = payload.getData(); + if (schemaNode instanceof ListSchemaNode) { + final List keyDefinitions = ((ListSchemaNode) schemaNode).getKeyDefinition(); + if (lastPathArgument instanceof NodeIdentifierWithPredicates && data instanceof MapEntryNode) { + final Map uriKeyValues = ((NodeIdentifierWithPredicates) lastPathArgument).getKeyValues(); + isEqualUriAndPayloadKeyValues(uriKeyValues, (MapEntryNode) data, keyDefinitions); } } } - private void isEqualUriAndPayloadKeyValues(final Map uriKeyValues, final NormalizedNode payload, - final List keyDefinitions) { + private static void isEqualUriAndPayloadKeyValues(final Map uriKeyValues, + final MapEntryNode payload, final List keyDefinitions) { + + final Map mutableCopyUriKeyValues = Maps.newHashMap(uriKeyValues); for (final QName keyDefinition : keyDefinitions) { - final Object uriKeyValue = uriKeyValues.get(keyDefinition); + final Object uriKeyValue = mutableCopyUriKeyValues.remove(keyDefinition); // should be caught during parsing URI to InstanceIdentifier - if (uriKeyValue == null) { - final String errMsg = "Missing key " + keyDefinition + " in URI."; - throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.DATA_MISSING); + RestconfValidationUtils.checkDocumentedError(uriKeyValue != null, ErrorType.PROTOCOL, ErrorTag.DATA_MISSING, + "Missing key " + keyDefinition + " in URI."); + + final Object dataKeyValue = payload.getIdentifier().getKeyValues().get(keyDefinition); + + if ( ! uriKeyValue.equals(dataKeyValue)) { + final String errMsg = "The value '" + uriKeyValue + "' for key '" + keyDefinition.getLocalName() + + "' specified in the URI doesn't match the value '" + dataKeyValue + "' specified in the message body. "; + throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } - // TODO thing about the possibility to fix -// final List> payloadKeyValues = payload.getSimpleNodesByName(keyDefinition.getLocalName()); -// if (payloadKeyValues.isEmpty()) { -// final String errMsg = "Missing key " + keyDefinition.getLocalName() + " in the message body."; -// throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.DATA_MISSING); -// } -// -// final Object payloadKeyValue = payloadKeyValues.iterator().next().getValue(); -// if (!uriKeyValue.equals(payloadKeyValue)) { -// final String errMsg = "The value '" + uriKeyValue + "' for key '" + keyDefinition.getLocalName() + -// "' specified in the URI doesn't match the value '" + payloadKeyValue + "' specified in the message body. "; -// throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); -// } } } @@ -825,7 +866,7 @@ public class RestconfImpl implements RestconfService { if (payloadNodeQname.compareTo(yangIdent.getLastPathArgument().getNodeType()) > 0) { return yangIdent; } - final InstanceIdentifierContext parentContext = payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext parentContext = payload.getInstanceIdentifierContext(); final SchemaNode parentSchemaNode = parentContext.getSchemaNode(); if(parentSchemaNode instanceof DataNodeContainer) { final DataNodeContainer cast = (DataNodeContainer) parentSchemaNode; @@ -848,22 +889,22 @@ public class RestconfImpl implements RestconfService { throw new RestconfDocumentedException("Input is required.", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE); } - final URI payloadNS = payload.getData().getNodeType().getNamespace(); - if (payloadNS == null) { - throw new RestconfDocumentedException( - "Data has bad format. Root element node must have namespace (XML format) or module name(JSON format)", - ErrorType.PROTOCOL, ErrorTag.UNKNOWN_NAMESPACE); - } + // FIXME: move this to parsing stage (we can have augmentation nodes here which do not have namespace) +// final URI payloadNS = payload.getData().getNodeType().getNamespace(); +// if (payloadNS == null) { +// throw new RestconfDocumentedException( +// "Data has bad format. Root element node must have namespace (XML format) or module name(JSON format)", +// ErrorType.PROTOCOL, ErrorTag.UNKNOWN_NAMESPACE); +// } final DOMMountPoint mountPoint = payload.getInstanceIdentifierContext().getMountPoint(); - final InstanceIdentifierContext iiWithData = (InstanceIdentifierContext) payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); - final YangInstanceIdentifier resultII; try { if (mountPoint != null) { broker.commitConfigurationDataPost(mountPoint, normalizedII, payload.getData()).checkedGet(); } else { - broker.commitConfigurationDataPost(normalizedII, payload.getData()).checkedGet(); + broker.commitConfigurationDataPost(controllerContext.getGlobalSchema(), normalizedII, payload.getData()).checkedGet(); } } catch(final RestconfDocumentedException e) { throw e; @@ -894,7 +935,7 @@ public class RestconfImpl implements RestconfService { @Override public Response deleteConfigurationData(final String identifier) { - final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); final DOMMountPoint mountPoint = iiWithData.getMountPoint(); final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); @@ -1028,79 +1069,6 @@ public class RestconfImpl implements RestconfService { return result; } - private boolean endsWithMountPoint(final String identifier) { - return identifier.endsWith(ControllerContext.MOUNT) || identifier.endsWith(ControllerContext.MOUNT + "/"); - } - - private String addMountPointIdentifier(final String identifier) { - final boolean endsWith = identifier.endsWith("/"); - if (endsWith) { - return (identifier + ControllerContext.MOUNT); - } - - return identifier + "/" + ControllerContext.MOUNT; - } - - private TypeDef typeDefinition(final TypeDefinition type, final QName nodeQName) { - TypeDefinition baseType = type; - QName qName = nodeQName; - while (baseType.getBaseType() != null) { - if (baseType instanceof ExtendedType) { - qName = baseType.getQName(); - } - baseType = baseType.getBaseType(); - } - - return new TypeDef(baseType, qName); - - } - - private TypeDef typeDefinition(final DataSchemaNode node) { - if (node instanceof LeafListSchemaNode) { - return typeDefinition(((LeafListSchemaNode)node).getType(), node.getQName()); - } else if (node instanceof LeafSchemaNode) { - return typeDefinition(((LeafSchemaNode)node).getType(), node.getQName()); - } else if (node instanceof AnyXmlSchemaNode) { - return null; - } else { - throw new IllegalArgumentException("Unhandled parameter types: " + Arrays. asList(node).toString()); - } - } - - private InstanceIdentifierContext normalizeInstanceIdentifierWithSchemaNode( - final InstanceIdentifierContext iiWithSchemaNode) { - return normalizeInstanceIdentifierWithSchemaNode(iiWithSchemaNode, false); - } - - private InstanceIdentifierContext normalizeInstanceIdentifierWithSchemaNode( - final InstanceIdentifierContext iiWithSchemaNode, final boolean unwrapLastListNode) { - return new InstanceIdentifierContext(instanceIdentifierToReadableFormForNormalizeNode( - iiWithSchemaNode.getInstanceIdentifier(), unwrapLastListNode), iiWithSchemaNode.getSchemaNode(), - iiWithSchemaNode.getMountPoint(),iiWithSchemaNode.getSchemaContext()); - } - - private YangInstanceIdentifier instanceIdentifierToReadableFormForNormalizeNode( - final YangInstanceIdentifier instIdentifier, final boolean unwrapLastListNode) { - Preconditions.checkNotNull(instIdentifier, "Instance identifier can't be null"); - final List result = new ArrayList(); - final Iterator iter = instIdentifier.getPathArguments().iterator(); - while (iter.hasNext()) { - final PathArgument pathArgument = iter.next(); - if (pathArgument instanceof NodeIdentifierWithPredicates && (iter.hasNext() || unwrapLastListNode)) { - result.add(new YangInstanceIdentifier.NodeIdentifier(pathArgument.getNodeType())); - } - result.add(pathArgument); - } - return YangInstanceIdentifier.create(result); - } - - private boolean isDataContainerNode(final DataSchemaNode schemaNode) { - if (schemaNode instanceof ContainerSchemaNode || schemaNode instanceof ListSchemaNode) { - return true; - } - return false; - } - public BigInteger getOperationalReceived() { // TODO Auto-generated method stub return null;