Adding support for link state to GUI.
Change-Id: I6476cf04810f7bc7e88af629a36ce671b42748d0
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java
index ca946d0..f981411 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java
@@ -82,6 +82,7 @@
if (device != null) {
result.put("id", device.id().toString())
.put("available", service.isAvailable(device.id()))
+ .put("type", device.type().toString())
.put("role", service.getRole(device.id()).toString())
.put("mfr", device.manufacturer())
.put("hw", device.hwVersion())
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 24f5c7b..7c32129 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
@@ -35,7 +35,7 @@
description = "Lists all infrastructure links")
public class LinksListCommand extends AbstractShellCommand {
- private static final String FMT = "src=%s/%s, dst=%s/%s, type=%s%s";
+ private static final String FMT = "src=%s/%s, dst=%s/%s, type=%s, state=%s%s";
private static final String COMPACT = "%s/%s-%s/%s";
@Argument(index = 0, name = "uri", description = "Device ID",
@@ -82,6 +82,8 @@
ObjectNode result = mapper.createObjectNode();
result.set("src", json(mapper, link.src()));
result.set("dst", json(mapper, link.dst()));
+ result.put("type", link.type().toString());
+ result.put("state", link.state().toString());
result.set("annotations", annotations(mapper, link.annotations()));
return result;
}
@@ -107,7 +109,8 @@
*/
public static String linkString(Link link) {
return String.format(FMT, link.src().deviceId(), link.src().port(),
- link.dst().deviceId(), link.dst().port(), link.type(),
+ link.dst().deviceId(), link.dst().port(),
+ link.type(), link.state(),
annotations(link.annotations()));
}