commit 1560384ea3d4efe7858d646fce3c82ffcee3a9b3
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Jan 25 19:26:08 2017 -0800
committer Jonathan Hart <jono@onlab.us> Thu Jan 26 14:47:40 2017 +0000
tree 387ce6ac6306f1f2d38f960c5c2eac93767fe09a
parent 6c28aa4711aa4a166b1e3540c977285cc7d02286

Correct parent class for portstats CLI

- Fixes issue, where --help looked as this command support -s,
  even if it actually didn't
- cosmetic fixes

Change-Id: I28df33be41b97e49ccc2c47b876076ac87c7742a

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

diff --git a/cli/src/main/java/org/onosproject/cli/net/DevicePortStatsCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicePortStatsCommand.java
index 0319f56..2493037 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DevicePortStatsCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DevicePortStatsCommand.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.cli.net;
 
+import static org.onosproject.cli.net.DevicesListCommand.getSortedDevices;
 import static org.onosproject.net.DeviceId.deviceId;
 
 import java.util.List;
@@ -24,6 +25,7 @@
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
+import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.device.DeviceService;
@@ -34,18 +36,21 @@
  */
 @Command(scope = "onos", name = "portstats",
         description = "Lists statistics of all ports in the system")
-public class DevicePortStatsCommand extends DevicesListCommand {
+public class DevicePortStatsCommand extends AbstractShellCommand {
 
     @Option(name = "-nz", aliases = "--nonzero", description = "Show only non-zero portstats",
             required = false, multiValued = false)
     private boolean nonzero = false;
 
-    @Option(name = "-d", aliases = "--delta", description = "Show Delta Port Statistics,"
+    @Option(name = "-d", aliases = "--delta",
+            description = "Show delta port statistics,"
             + "only for the last polling interval",
             required = false, multiValued = false)
     private boolean delta = false;
 
-    @Option(name = "-t", aliases = "--table", description = "Show human readable table format for statistics",
+    @Option(name = "-t", aliases = "--table",
+            description = "Show delta port statistics in table format "
+                    + "using human readable unit",
             required = false, multiValued = false)
     private boolean table = false;
 
@@ -111,6 +116,7 @@
                     stat.bytesSent(), stat.packetsRxDropped(), stat.packetsTxDropped(), stat.durationSec());
         }
     }
+
     /**
      * Prints Port delta statistics.
      *
@@ -200,6 +206,7 @@
         Character pre = ("KMGTPE").charAt(exp - 1);
         return String.format("%.2f%s", bytes / Math.pow(unit, exp), pre);
     }
+
     /**
      * Converts bps to human readable format.
      *
@@ -209,7 +216,7 @@
     public static String humanReadableBps(float bps) {
         int unit = 1000;
         if (bps < unit) {
-            return String.format("%.0f ", (float) bps);
+            return String.format("%.0f ", bps);
         }
         int exp = (int) (Math.log(bps) / Math.log(unit));
         Character pre = ("KMGTPE").charAt(exp - 1);