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=d37f8dda5c1c759d90c7dc8fe731a5ddc5b417d3;hb=ed6eb82da5d9712d15847e07d2836f449dbece93;hp=1514a15d1132417849a0efb29e53b0ea26113b8f;hpb=9fb1df14f2dc885fee1dce821b753cc99af6e54f;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 1514a15d11..d37f8dda5c 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; @@ -24,10 +26,10 @@ 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; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -48,6 +50,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; @@ -64,6 +67,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; @@ -87,7 +91,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; @@ -158,13 +168,12 @@ public class RestconfImpl implements RestconfService { SAL_REMOTE_AUG_IDENTIFIER = new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(QName.create(SAL_REMOTE_AUGMENT, "scope"), QName.create(SAL_REMOTE_AUGMENT, "datastore"))); } catch (final ParseException e) { - throw new RestconfDocumentedException( - "It wasn't possible to convert revision date of sal-remote-augment to date", ErrorType.APPLICATION, - ErrorTag.OPERATION_FAILED); + final String errMsg = "It wasn't possible to convert revision date of sal-remote-augment to date"; + LOG.debug(errMsg); + throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED); } catch (final URISyntaxException e) { - throw new RestconfDocumentedException( - "It wasn't possible to create instance of URI class with "+NETCONF_BASE+" URI", ErrorType.APPLICATION, - ErrorTag.OPERATION_FAILED); + final String errMsg = "It wasn't possible to create instance of URI class with "+NETCONF_BASE+" URI"; + throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED); } } @@ -212,6 +221,7 @@ public class RestconfImpl implements RestconfService { if ( ! identifier.contains(ControllerContext.MOUNT)) { final String errMsg = "URI has bad format. If modules behind mount point should be showed," + " URI has to end with " + ControllerContext.MOUNT; + LOG.debug(errMsg + " for " + identifier); throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } @@ -253,6 +263,7 @@ public class RestconfImpl implements RestconfService { if (module == null) { final String errMsg = "Module with name '" + moduleNameAndRevision.getLocalName() + "' and revision '" + moduleNameAndRevision.getRevision() + "' was not found."; + LOG.debug(errMsg); throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT); } @@ -314,23 +325,80 @@ public class RestconfImpl implements RestconfService { } else { final String errMsg = "URI has bad format. If operations behind mount point should be showed, URI has to end with "; + LOG.debug(errMsg + ControllerContext.MOUNT + " for " + identifier); throw new RestconfDocumentedException(errMsg + ControllerContext.MOUNT, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } 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() { final Module restconfModule = controllerContext.getRestconfModule(); if (restconfModule == null) { + LOG.debug("ietf-restconf module was not found."); throw new RestconfDocumentedException("ietf-restconf module was not found.", ErrorType.APPLICATION, ErrorTag.OPERATION_NOT_SUPPORTED); } @@ -351,6 +419,7 @@ public class RestconfImpl implements RestconfService { final Iterable split = splitter.split(moduleNameAndRevision); final List pathArgs = Lists. newArrayList(split); if (pathArgs.size() < 2) { + LOG.debug("URI has bad format. It should be \'moduleName/yyyy-MM-dd\' " + identifier); throw new RestconfDocumentedException( "URI has bad format. End of URI should be in format \'moduleName/yyyy-MM-dd\'", ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); @@ -362,6 +431,7 @@ public class RestconfImpl implements RestconfService { final Date moduleRevision = REVISION_FORMAT.parse(revision); return QName.create(null, moduleRevision, moduleName); } catch (final ParseException e) { + LOG.debug("URI has bad format. It should be \'moduleName/yyyy-MM-dd\' " + identifier); throw new RestconfDocumentedException("URI has bad format. It should be \'moduleName/yyyy-MM-dd\'", ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } @@ -382,6 +452,7 @@ public class RestconfImpl implements RestconfService { if (identifier.contains(MOUNT_POINT_MODULE_NAME) && mountPoint != null) { final Optional mountRpcServices = mountPoint.getService(DOMRpcService.class); if ( ! mountRpcServices.isPresent()) { + LOG.debug("Error: Rpc service is missing."); throw new RestconfDocumentedException("Rpc service is missing."); } schemaContext = mountPoint.getSchemaContext(); @@ -416,19 +487,16 @@ public class RestconfImpl implements RestconfService { if (retValue.getErrors() == null || retValue.getErrors().isEmpty()) { return retValue; } + LOG.debug("RpcError message", retValue.getErrors()); throw new RestconfDocumentedException("RpcError message", null, retValue.getErrors()); - } - 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 InterruptedException e) { + final String errMsg = "The operation was interrupted while executing and did not complete."; + LOG.debug("Rpc Interrupt - " + errMsg, e); + throw new RestconfDocumentedException(errMsg, ErrorType.RPC, ErrorTag.PARTIAL_OPERATION); + } catch (final ExecutionException e) { + LOG.debug("Execution RpcError: ", 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(); } @@ -437,13 +505,14 @@ public class RestconfImpl implements RestconfService { throw new RestconfDocumentedException(cause.getMessage(), ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } - - throw new RestconfDocumentedException("The operation encountered an unexpected error while executing.", - cause); + throw new RestconfDocumentedException("The operation encountered an unexpected error while executing.",cause); } else { - throw new RestconfDocumentedException("The operation encountered an unexpected error while executing.", - e); + throw new RestconfDocumentedException("The operation encountered an unexpected error while executing.",e); } + } catch (final CancellationException e) { + final String errMsg = "The operation was cancelled while executing."; + LOG.debug("Cancel RpcExecution: " + errMsg, e); + throw new RestconfDocumentedException(errMsg, ErrorType.RPC, ErrorTag.PARTIAL_OPERATION); } } @@ -471,17 +540,17 @@ public class RestconfImpl implements RestconfService { final Object pathValue = path.isPresent() ? path.get().getValue() : null; if (!(pathValue instanceof YangInstanceIdentifier)) { - throw new RestconfDocumentedException("Instance identifier was not normalized correctly.", - ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED); + final String errMsg = "Instance identifier was not normalized correctly "; + LOG.debug(errMsg + rpcQName); + throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED); } final YangInstanceIdentifier pathIdentifier = ((YangInstanceIdentifier) pathValue); String streamName = null; - if (!Iterables.isEmpty(pathIdentifier.getPathArguments())) { + if (!pathIdentifier.isEmpty()) { final String fullRestconfIdentifier = controllerContext.toFullRestconfIdentifier(pathIdentifier, null); - LogicalDatastoreType datastore = parseEnumTypeParameter(value, LogicalDatastoreType.class, - DATASTORE_PARAM_NAME); + LogicalDatastoreType datastore = parseEnumTypeParameter(value, LogicalDatastoreType.class, DATASTORE_PARAM_NAME); datastore = datastore == null ? DEFAULT_DATASTORE : datastore; DataChangeScope scope = parseEnumTypeParameter(value, DataChangeScope.class, SCOPE_PARAM_NAME); @@ -492,9 +561,9 @@ public class RestconfImpl implements RestconfService { } if (Strings.isNullOrEmpty(streamName)) { - throw new RestconfDocumentedException( - "Path is empty or contains value node which is not Container or List build-in type.", - ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); + final String errMsg = "Path is empty or contains value node which is not Container or List build-in type."; + LOG.debug(errMsg + pathIdentifier); + throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } final QName outputQname = QName.create(rpcQName, "output"); @@ -504,8 +573,7 @@ public class RestconfImpl implements RestconfService { .withChild(ImmutableNodes.leafNode(streamNameQname, streamName)).build(); if (!Notificator.existListenerFor(streamName)) { - final YangInstanceIdentifier normalizedPathIdentifier = controllerContext.toNormalized(pathIdentifier); - Notificator.createListener(normalizedPathIdentifier, streamName); + Notificator.createListener(pathIdentifier, streamName); } final DOMRpcResult defaultDOMRpcResult = new DefaultDOMRpcResult(output); @@ -535,6 +603,7 @@ public class RestconfImpl implements RestconfService { } else if (identifier.indexOf("/") != CHAR_NOT_FOUND) { final String slashErrorMsg = String.format("Identifier %n%s%ncan\'t contain slash " + "character (/).%nIf slash is part of identifier name then use %%2F placeholder.", identifier); + LOG.debug(slashErrorMsg); throw new RestconfDocumentedException(slashErrorMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } else { identifierEncoded = identifier; @@ -551,10 +620,12 @@ public class RestconfImpl implements RestconfService { } if (rpc == null) { + LOG.debug("RPC " + identifierDecoded + " does not exist."); throw new RestconfDocumentedException("RPC does not exist.", ErrorType.RPC, ErrorTag.UNKNOWN_ELEMENT); } if (rpc.getInput() != null) { + LOG.debug("RPC " + rpc + " does not need input value."); // FIXME : find a correct Error from specification throw new IllegalStateException("RPC " + rpc + " does'n need input value!"); } @@ -588,9 +659,9 @@ public class RestconfImpl implements RestconfService { private RpcDefinition findRpc(final SchemaContext schemaContext, final String identifierDecoded) { final String[] splittedIdentifier = identifierDecoded.split(":"); if (splittedIdentifier.length != 2) { - throw new RestconfDocumentedException(identifierDecoded - + " couldn't be splitted to 2 parts (module:rpc name)", ErrorType.APPLICATION, - ErrorTag.INVALID_VALUE); + final String errMsg = identifierDecoded + " couldn't be splitted to 2 parts (module:rpc name)"; + LOG.debug(errMsg); + throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.INVALID_VALUE); } for (final Module module : schemaContext.getModules()) { if (module.getName().equals(splittedIdentifier[0])) { @@ -616,9 +687,9 @@ public class RestconfImpl implements RestconfService { data = broker.readConfigurationData(normalizedII); } if(data == null) { - throw new RestconfDocumentedException( - "Request could not be completed because the relevant data model content does not exist.", - ErrorType.APPLICATION, ErrorTag.DATA_MISSING); + final String errMsg = "Request could not be completed because the relevant data model content does not exist "; + LOG.debug(errMsg + identifier); + throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.DATA_MISSING); } return new NormalizedNodeContext(iiWithData, data); } @@ -659,9 +730,9 @@ public class RestconfImpl implements RestconfService { data = broker.readOperationalData(normalizedII); } if(data == null) { - throw new RestconfDocumentedException( - "Request could not be completed because the relevant data model content does not exist.", - ErrorType.APPLICATION, ErrorTag.DATA_MISSING); + final String errMsg = "Request could not be completed because the relevant data model content does not exist "; + LOG.debug(errMsg + identifier); + throw new RestconfDocumentedException(errMsg , ErrorType.APPLICATION, ErrorTag.DATA_MISSING); } return new NormalizedNodeContext(iiWithData, data); } @@ -673,7 +744,7 @@ public class RestconfImpl implements RestconfService { validateInput(iiWithData.getSchemaNode(), payload); validateTopLevelNodeName(payload, iiWithData.getInstanceIdentifier()); - validateListKeysEqualityInPayloadAndUri(iiWithData, payload.getData()); + validateListKeysEqualityInPayloadAndUri(payload); final DOMMountPoint mountPoint = iiWithData.getMountPoint(); final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); @@ -704,12 +775,13 @@ public class RestconfImpl implements RestconfService { } catch (final TransactionCommitFailedException e) { if(e instanceof OptimisticLockFailedException) { if(--tries <= 0) { - LOG.debug("Got OptimisticLockFailedException on last try - failing"); + LOG.debug("Got OptimisticLockFailedException on last try - failing " + identifier); throw new RestconfDocumentedException(e.getMessage(), e, e.getErrorList()); } - LOG.debug("Got OptimisticLockFailedException - trying again"); + LOG.debug("Got OptimisticLockFailedException - trying again " + identifier); } else { + LOG.debug("Update ConfigDataStore fail " + identifier, e); throw new RestconfDocumentedException(e.getMessage(), e, e.getErrorList()); } } @@ -722,19 +794,18 @@ public class RestconfImpl implements RestconfService { final YangInstanceIdentifier identifier) { final String payloadName = node.getData().getNodeType().getLocalName(); - final Iterator pathArguments = identifier.getReversePathArguments().iterator(); //no arguments - if ( ! pathArguments.hasNext()) { + if (identifier.isEmpty()) { //no "data" payload - if ( ! node.getData().getNodeType().equals(NETCONF_BASE_QNAME)) { + if (!node.getData().getNodeType().equals(NETCONF_BASE_QNAME)) { throw new RestconfDocumentedException("Instance identifier has to contain at least one path argument", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE); } //any arguments } else { - final String identifierName = pathArguments.next().getNodeType().getLocalName(); - if ( ! payloadName.equals(identifierName)) { + final String identifierName = identifier.getLastPathArgument().getNodeType().getLocalName(); + if (!payloadName.equals(identifierName)) { throw new RestconfDocumentedException("Payload name (" + payloadName + ") is different from identifier name (" + identifierName + ")", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE); @@ -749,41 +820,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); -// } } } @@ -818,7 +886,8 @@ public class RestconfImpl implements RestconfService { if (parentSchemaNode instanceof RpcDefinition) { return yangIdent; } - final String errMsg = "Error parsing input: DataSchemaNode has not children"; + final String errMsg = "Error parsing input: DataSchemaNode has not children "; + LOG.info(errMsg + yangIdent); throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE); } @@ -848,7 +917,9 @@ public class RestconfImpl implements RestconfService { } catch(final RestconfDocumentedException e) { throw e; } catch (final Exception e) { - throw new RestconfDocumentedException("Error creating data", e); + final String errMsg = "Error creating data "; + LOG.info(errMsg + uriInfo.getPath(), e); + throw new RestconfDocumentedException(errMsg, e); } final ResponseBuilder responseBuilder = Response.status(Status.NO_CONTENT); @@ -866,7 +937,7 @@ public class RestconfImpl implements RestconfService { try { uriBuilder.path(controllerContext.toFullRestconfIdentifier(normalizedII, mountPoint)); } catch (final Exception e) { - LOG.debug("Location for instance identifier"+normalizedII+"wasn't created", e); + LOG.info("Location for instance identifier" + normalizedII + "wasn't created", e); return null; } return uriBuilder.build(); @@ -890,7 +961,9 @@ public class RestconfImpl implements RestconfService { if (searchedException.isPresent()) { throw new RestconfDocumentedException("Data specified for deleting doesn't exist.", ErrorType.APPLICATION, ErrorTag.DATA_MISSING); } - throw new RestconfDocumentedException("Error while deleting data", e); + final String errMsg = "Error while deleting data"; + LOG.info(errMsg, e); + throw new RestconfDocumentedException(errMsg, e); } return Response.status(Status.OK).build(); }