Merge "Changed LOCAL port number in the CLI to "local"."

@@ -25,6 +25,7 @@ import org.apache.karaf.shell.commands.Option;
 import org.onlab.onos.cli.Comparators;
 import org.onlab.onos.cli.Comparators;
 import org.onlab.onos.net.Device;
 import org.onlab.onos.net.Device;
 import org.onlab.onos.net.Port;
 import org.onlab.onos.net.Port;
+import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.device.DeviceService;
 import org.onlab.onos.net.device.DeviceService;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -108,7 +109,7 @@ public class DevicePortsListCommand extends DevicesListCommand {
         for (Port port : service.getPorts(device.id())) {
         for (Port port : service.getPorts(device.id())) {
             if (isIncluded(port)) {
             if (isIncluded(port)) {
                 ports.add(mapper.createObjectNode()
                 ports.add(mapper.createObjectNode()
-                                  .put("port", port.number().toString())
+                                  .put("port", portName(port.number()))
                                   .put("isEnabled", port.isEnabled())
                                   .put("isEnabled", port.isEnabled())
                                   .put("type", port.type().toString().toLowerCase())
                                   .put("type", port.type().toString().toLowerCase())
                                   .put("portSpeed", port.portSpeed())
                                   .put("portSpeed", port.portSpeed())
@@ -120,6 +121,10 @@ public class DevicePortsListCommand extends DevicesListCommand {
         return result;
         return result;
     }
     }
 
 
+    private String portName(PortNumber port) {
+        return port.equals(PortNumber.LOCAL) ? "local" : port.toString();
+    }
+
     // Determines if a port should be included in output.
     // Determines if a port should be included in output.
     private boolean isIncluded(Port port) {
     private boolean isIncluded(Port port) {
         return enabled && port.isEnabled() || disabled && !port.isEnabled() ||
         return enabled && port.isEnabled() || disabled && !port.isEnabled() ||
@@ -133,7 +138,8 @@ public class DevicePortsListCommand extends DevicesListCommand {
         Collections.sort(ports, Comparators.PORT_COMPARATOR);
         Collections.sort(ports, Comparators.PORT_COMPARATOR);
         for (Port port : ports) {
         for (Port port : ports) {
             if (isIncluded(port)) {
             if (isIncluded(port)) {
-                print(FMT, port.number(), port.isEnabled() ? "enabled" : "disabled",
+                print(FMT, portName(port.number()),
+                      port.isEnabled() ? "enabled" : "disabled",
                       port.type().toString().toLowerCase(), port.portSpeed(),
                       port.type().toString().toLowerCase(), port.portSpeed(),
                       annotations(port.annotations()));
                       annotations(port.annotations()));
             }
             }