* fixed mount point path builder that added each list qname twice
Manually cherry picked from controller patch to netconf patch:
https://git.opendaylight.org/gerrit/#/c/25531
Change-Id: I631961f3b0d791c6e8ab2921ef6eb163e68e7753
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
builder.append(moduleName);
builder.append(':');
}
builder.append(moduleName);
builder.append(':');
}
for (PathArgument arg : key.getPathArguments()) {
for (PathArgument arg : key.getPathArguments()) {
String name = arg.getNodeType().getLocalName();
String name = arg.getNodeType().getLocalName();
- if (first) {
- first = false;
- } else {
- builder.append('/');
- }
- builder.append(name);
if (arg instanceof YangInstanceIdentifier.NodeIdentifierWithPredicates) {
NodeIdentifierWithPredicates nodeId = (NodeIdentifierWithPredicates) arg;
for (Entry<QName, Object> entry : nodeId.getKeyValues().entrySet()) {
if (arg instanceof YangInstanceIdentifier.NodeIdentifierWithPredicates) {
NodeIdentifierWithPredicates nodeId = (NodeIdentifierWithPredicates) arg;
for (Entry<QName, Object> entry : nodeId.getKeyValues().entrySet()) {
- builder.append('/').append(entry.getValue());
+ builder.append(entry.getValue()).append('/');
+ } else {
+ builder.append(name);
+ builder.append('/');
-
- return builder.append('/').toString();
+ return builder.toString();
}
private String getYangMountUrl(final YangInstanceIdentifier key) {
}
private String getYangMountUrl(final YangInstanceIdentifier key) {
private static final String HTTP_URL = "http://localhost/path";
private static final YangInstanceIdentifier instanceId = YangInstanceIdentifier.builder()
.node(QName.create("nodes"))
private static final String HTTP_URL = "http://localhost/path";
private static final YangInstanceIdentifier instanceId = YangInstanceIdentifier.builder()
.node(QName.create("nodes"))
+ .node(QName.create("node"))
.nodeWithKey(QName.create("node"), QName.create("id"), "123").build();
private static final String INSTANCE_URL = "nodes/node/123/";
private MountPointSwagger swagger;
.nodeWithKey(QName.create("node"), QName.create("id"), "123").build();
private static final String INSTANCE_URL = "nodes/node/123/";
private MountPointSwagger swagger;