* fixed mount point path builder that added each list qname twice
Change-Id: I96d541ea8b40ab5003f82a9e5981e11e1f0fd0d2
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
(cherry picked from commit
523e75af81fa6537117ceae53c7cdb2b1881aa10)
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;