final InstanceIdentifierBuilder builder = YangInstanceIdentifier.builder();
final Module latestModule = globalSchema.findModuleByName(startModule, null);
+
+ if (latestModule == null) {
+ throw new RestconfDocumentedException("The module named '" + startModule + "' does not exist.", ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT);
+ }
+
final InstanceIdentifierContext<?> iiWithSchemaNode = collectPathArguments(builder, pathArgs, latestModule, null,
toMountPointIdentifier);
if (!(element instanceof AugmentationIdentifier)) {
final QName _nodeType = element.getNodeType();
final DataSchemaNode potentialNode = ControllerContext.childByQName(node, _nodeType);
- if (!(element instanceof NodeIdentifier && potentialNode instanceof ListSchemaNode)) {
- if (!ControllerContext.isListOrContainer(potentialNode)) {
- return null;
+ if (!(element instanceof NodeIdentifier && potentialNode instanceof ListSchemaNode) &&
+ !(potentialNode instanceof ChoiceSchemaNode)) {
+ builder.append(convertToRestconfIdentifier(element, potentialNode, mount));
+ if (potentialNode instanceof DataNodeContainer) {
+ node = (DataNodeContainer) potentialNode;
}
- builder.append(convertToRestconfIdentifier(element, (DataNodeContainer) potentialNode, mount));
- node = (DataNodeContainer) potentialNode;
}
}
}
if (!mountOpt.isPresent()) {
LOG.debug("Instance identifier to missing mount point: {}", partialPath);
throw new RestconfDocumentedException("Mount point does not exist.", ErrorType.PROTOCOL,
- ErrorTag.UNKNOWN_ELEMENT);
+ ErrorTag.DATA_MISSING);
}
final DOMMountPoint mount = mountOpt.get();
return null;
}
- private CharSequence convertToRestconfIdentifier(final PathArgument argument, final DataNodeContainer node, final DOMMountPoint mount) {
- if (argument instanceof NodeIdentifier && node instanceof ContainerSchemaNode) {
+ private CharSequence convertToRestconfIdentifier(final PathArgument argument, final DataSchemaNode node, final DOMMountPoint mount) {
+ if (argument instanceof NodeIdentifier) {
return convertToRestconfIdentifier((NodeIdentifier) argument, mount);
} else if (argument instanceof NodeIdentifierWithPredicates && node instanceof ListSchemaNode) {
return convertToRestconfIdentifierWithPredicates((NodeIdentifierWithPredicates) argument, (ListSchemaNode) node, mount);