commit cd06c69b69e4e326980b09eb08396ae06b792915
author Charles Chan <rascov@gmail.com> Thu Apr 27 20:46:06 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Mon May 29 18:19:19 2017 +0000
tree 31a1b606b9661e571760183efa6cd6a77aff81bb
parent 3ca0b2e0278623da892a8cec0cc6d1ccc1d4fb52

Extend host structures to store multiple locations

Also update host location format in CLI and REST API

Change-Id: I0fbd655f642627dd3eb8a2925f83a3ee016fe4aa

cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java
index 3ec3ce3..95b72e5 100644
--- a/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java
@@ -38,10 +38,10 @@
 public class HostsListCommand extends AbstractShellCommand {
 
     private static final String FMT =
-            "id=%s, mac=%s, location=%s/%s, vlan=%s, ip(s)=%s%s, configured=%s";
+            "id=%s, mac=%s, location=%s, vlan=%s, ip(s)=%s%s, configured=%s";
 
     private static final String FMT_SHORT =
-            "id=%s, mac=%s, location=%s/%s, vlan=%s, ip(s)=%s";
+            "id=%s, mac=%s, location=%s, vlan=%s, ip(s)=%s";
 
     @Option(name = "-s", aliases = "--short", description = "Show short output only",
             required = false, multiValued = false)
@@ -88,11 +88,11 @@
     protected void printHost(Host host) {
         if (shortOnly) {
             print(FMT_SHORT, host.id(), host.mac(),
-                  host.location().deviceId(), host.location().port(),
+                  host.locations(),
                   host.vlan(), host.ipAddresses());
         } else {
             print(FMT, host.id(), host.mac(),
-                  host.location().deviceId(), host.location().port(),
+                  host.locations(),
                   host.vlan(), host.ipAddresses(), annotations(host.annotations()),
                   host.configured());
         }