commit 944cb6c30dfeaa01ee9991fd54014ffd9782e17a
author Thomas Vachuska <tom@onlab.us> Wed Oct 22 17:05:42 2014 -0700
committer Thomas Vachuska <tom@onlab.us> Wed Oct 22 17:05:42 2014 -0700
tree d74dd40a4b2607d366d4eb5b4741910ae014e98d
parent 9b8278c8aab40d435b8ba703c902dd190adb121c

Added CLI support for showing key/value annotations for devices, ports, links & hosts.

cli/src/main/java/org/onlab/onos/cli/net/HostsListCommand.java

diff --git a/cli/src/main/java/org/onlab/onos/cli/net/HostsListCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/HostsListCommand.java
index 2291f4e..0265116 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/HostsListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/HostsListCommand.java
@@ -42,7 +42,7 @@
 public class HostsListCommand extends AbstractShellCommand {
 
     private static final String FMT =
-            "id=%s, mac=%s, location=%s/%s, vlan=%s, ip(s)=%s";
+            "id=%s, mac=%s, location=%s/%s, vlan=%s, ip(s)=%s%s";
 
     @Override
     protected void execute() {
@@ -80,6 +80,7 @@
                 .put("vlan", host.vlan().toString());
         result.set("location", loc);
         result.set("ips", ips);
+        result.set("annotations", annotations(mapper, host.annotations()));
         return result;
     }
 
@@ -105,7 +106,8 @@
             print(FMT, host.id(), host.mac(),
                   host.location().deviceId(),
                   host.location().port(),
-                  host.vlan(), host.ipAddresses());
+                  host.vlan(), host.ipAddresses(),
+                  annotations(host.annotations()));
         }
     }
 }