commit c290a12541bee350b3e5aaa01186e48059528a5a
author tom <tom@onlab.us> Mon Sep 08 14:27:13 2014 -0700
committer tom <tom@onlab.us> Mon Sep 08 14:27:13 2014 -0700
tree 07337e16ac162a1389b654c7b3127b42fa12b5b7
parent d79f7ec608d173ac0a85ad446c3b9e23a79b6fe9

Enhanced the CLIs.

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

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 650e6a0..1cbeb6b 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
@@ -19,7 +19,7 @@
 public class DevicesListCommand extends AbstractShellCommand {
 
     private static final String FMT =
-            "id=%s, available=%s, type=%s, mfr=%s, hw=%s, sw=%s, serial=%s";
+            "id=%s, available=%s, role=%s, type=%s, mfr=%s, hw=%s, sw=%s, serial=%s";
 
     protected static final Comparator<Device> ID_COMPARATOR = new Comparator<Device>() {
         @Override
@@ -32,7 +32,7 @@
     protected Object doExecute() throws Exception {
         DeviceService service = getService(DeviceService.class);
         for (Device device : getSortedDevices(service)) {
-            printDevice(device, service.isAvailable(device.id()));
+            printDevice(service, device);
         }
         return null;
     }
@@ -52,11 +52,12 @@
     /**
      * Prints information about the specified device.
      *
-     * @param device      infrastructure device
-     * @param isAvailable true of device is available
+     * @param service device service
+     * @param device  infrastructure device
      */
-    protected void printDevice(Device device, boolean isAvailable) {
-        print(FMT, device.id(), isAvailable, device.type(),
+    protected void printDevice(DeviceService service, Device device) {
+        print(FMT, device.id(), service.isAvailable(device.id()),
+              service.getRole(device.id()), device.type(),
               device.manufacturer(), device.hwVersion(), device.swVersion(),
               device.serialNumber());
     }