홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
b129fbf1 1 parent 1827562d

FIxed netcfg CLI to avoid double-nesting configs. 

Change-Id: I4b988cdf437c40059b3f2bbfcff4e216eadea034
Inline Side-by-side
Showing 1 changed file with 4 additions and 7 deletions
......@@ -63,7 +63,7 @@ public class NetworkConfigCommand extends AbstractShellCommand {
if (isNullOrEmpty(configKey)) {
addSubject(root, s);
} else {
addSubjectConfig(root, getConfig(s, configKey));
root = getSubjectConfig(getConfig(s, configKey));
}
}
}
......@@ -86,14 +86,11 @@ public class NetworkConfigCommand extends AbstractShellCommand {
}
private void addSubject(ObjectNode root, Object s) {
service.getConfigs(s)
.forEach(c -> addSubjectConfig(newObject(root, c.key()), getConfig(s, c.key())));
service.getConfigs(s).forEach(c -> root.set(c.key(), c.node()));
}
private void addSubjectConfig(ObjectNode root, Config config) {
if (config != null) {
root.set(config.key(), config.node());
}
private ObjectNode getSubjectConfig(Config config) {
return config != null ? config.node() : null;
}
private Config getConfig(Object s, String ck) {
......