Show chassisId in CLI and fix UI string

Change-Id: Iec755760d7c8a3a52502768f903d867907709543
diff --git a/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
index d4dd14e..4b95f0f 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
@@ -41,7 +41,8 @@
 public class DevicesListCommand extends AbstractShellCommand {
 
     private static final String FMT =
-            "id=%s, available=%s, local-status=%s, role=%s, type=%s, mfr=%s, hw=%s, sw=%s, serial=%s, driver=%s%s";
+            "id=%s, available=%s, local-status=%s, role=%s, type=%s, mfr=%s, hw=%s, sw=%s, " +
+                    "serial=%s, chassis=%s, driver=%s%s";
 
     private static final String FMT_SHORT =
             "id=%s, available=%s, role=%s, type=%s, driver=%s";
@@ -106,7 +107,7 @@
                       deviceService.localStatus(device.id()),
                       deviceService.getRole(device.id()), device.type(),
                       device.manufacturer(), device.hwVersion(), device.swVersion(),
-                      device.serialNumber(), driver,
+                      device.serialNumber(), device.chassisId(), driver,
                       annotations(device.annotations(), ImmutableSet.of(AnnotationKeys.DRIVER)));
             }
         }