commit b129fbf1380764204d315423fbb86b0d0fa7b592
author Thomas Vachuska <tom@onlab.us> Thu Jul 23 00:49:03 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 23 15:55:51 2015 +0000
tree 1f1ac09bd10c4a2883dbf341758d9e35faa71327
parent 1827562de8e2842c9ff93f7e0fe2a052e82468fc

FIxed netcfg CLI to avoid double-nesting configs.

Change-Id: I4b988cdf437c40059b3f2bbfcff4e216eadea034

cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
index 9d2e36f..d225248 100644
--- a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
@@ -63,7 +63,7 @@
                 if (isNullOrEmpty(configKey)) {
                     addSubject(root, s);
                 } else {
-                    addSubjectConfig(root, getConfig(s, configKey));
+                    root = getSubjectConfig(getConfig(s, configKey));
                 }
             }
         }
@@ -86,14 +86,11 @@
     }
 
     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) {