Enahnced path list command to show JSON.
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
index 59d2be7..1c3287e 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
@@ -66,7 +66,7 @@
public static ObjectNode json(ObjectMapper mapper, Link link) {
ObjectNode result = mapper.createObjectNode();
result.set("src", json(mapper, link.src()));
- result.set("dst", json(mapper, link.src()));
+ result.set("dst", json(mapper, link.dst()));
return result;
}
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/PathListCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/PathListCommand.java
index 8bb808a..6777625 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/PathListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/PathListCommand.java
@@ -1,5 +1,8 @@
package org.onlab.onos.cli.net;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onlab.onos.net.Link;
@@ -32,12 +35,33 @@
protected void execute() {
init();
Set<Path> paths = service.getPaths(topology, deviceId(src), deviceId(dst));
- for (Path path : paths) {
- print(pathString(path));
+ if (outputJson()) {
+ print("%s", json(paths));
+ } else {
+ for (Path path : paths) {
+ print(pathString(path));
+ }
}
}
/**
+ * Produces a JSON array containing the specified paths.
+ *
+ * @param paths collection of paths
+ * @return JSON array
+ */
+ public static JsonNode json(Iterable<Path> paths) {
+ ObjectMapper mapper = new ObjectMapper();
+ ArrayNode result = mapper.createArrayNode();
+ for (Path path : paths) {
+ result.add(LinksListCommand.json(mapper, path)
+ .put("cost", path.cost())
+ .set("links", LinksListCommand.json(path.links())));
+ }
+ return result;
+ }
+
+ /**
* Produces a formatted string representing the specified path.
*
* @param path network path