Last patch lost pre-rewrite logic. This patch applies old logic again.
JIRA: NETCONF-938
Change-Id: I76c960d324b487a8de101a0949ba3214685f34e4
Signed-off-by: lubos-cicut <lubos.cicut@pantheon.tech>
final var localName = moduleName + ":" + nodeLocalName;
final var path = urlPrefix + "/" + processPath(node, pathParams, localName);
processChildNode(node, pathParams, moduleName, result, path, nodeLocalName, isConfig, schemaContext,
final var localName = moduleName + ":" + nodeLocalName;
final var path = urlPrefix + "/" + processPath(node, pathParams, localName);
processChildNode(node, pathParams, moduleName, result, path, nodeLocalName, isConfig, schemaContext,
- deviceName, basePath, node);
+ deviceName, basePath, null);
}
private String processOperationsRef(final OperationDefinition def, final String operationName, final String suf) {
}
private String processOperationsRef(final OperationDefinition def, final String operationName, final String suf) {
- final var ref = COMPONENTS_PREFIX + moduleName() + "_" + operationName + suf;
if (def instanceof ActionDefinition && parentNode != null) {
final var parentName = ((DataSchemaNode) parentNode).getQName().getLocalName();
if (def instanceof ActionDefinition && parentNode != null) {
final var parentName = ((DataSchemaNode) parentNode).getQName().getLocalName();
- if (!operationName.contains(parentName)) {
+ final boolean hasChildNodes = suf.equals(INPUT_SUFFIX) ? !def.getInput().getChildNodes().isEmpty()
+ : !def.getOutput().getChildNodes().isEmpty();
+ if (hasChildNodes) {
return COMPONENTS_PREFIX + moduleName() + "_" + parentName + "_" + operationName + suf;
}
}
return COMPONENTS_PREFIX + moduleName() + "_" + parentName + "_" + operationName + suf;
}
}
+ return COMPONENTS_PREFIX + moduleName() + "_" + operationName + suf;