Rename Meter,AddMeter,GetFlowStatistics,GetStatistics

Change-Id: Ifdc7fb422f7e2bb4135ab24bae0f8d9541432e0c

@@ -30,11 +30,11 @@ import org.onosproject.net.meter.MeterService;
 import java.util.Collections;
 import java.util.Collections;
 
 
 /**
 /**
- * Add a meter.
+ * Add a meter to a device.
  */
  */
 @Command(scope = "onos", name = "add-meter",
 @Command(scope = "onos", name = "add-meter",
         description = "Adds a meter to a device (currently for testing)")
         description = "Adds a meter to a device (currently for testing)")
-public class AddMeter extends AbstractShellCommand {
+public class AddMeterCommand extends AbstractShellCommand {
 
 
     @Argument(index = 0, name = "uri", description = "Device ID",
     @Argument(index = 0, name = "uri", description = "Device ID",
             required = true, multiValued = false)
             required = true, multiValued = false)

@@ -43,7 +43,7 @@ import static org.onosproject.net.PortNumber.portNumber;
  */
  */
 @Command(scope = "onos", name = "get-flow-stats",
 @Command(scope = "onos", name = "get-flow-stats",
         description = "Fetches flow stats for a connection point with given flow type and instruction type")
         description = "Fetches flow stats for a connection point with given flow type and instruction type")
-public class GetFlowStatistics extends AbstractShellCommand {
+public class GetFlowStatisticsCommand extends AbstractShellCommand {
     @Argument(index = 0, name = "devicePort",
     @Argument(index = 0, name = "devicePort",
             description = "Device[/Port] connectPoint Description",
             description = "Device[/Port] connectPoint Description",
             required = true, multiValued = false)
             required = true, multiValued = false)

@@ -34,7 +34,7 @@ import static org.onosproject.net.PortNumber.portNumber;
  */
  */
 @Command(scope = "onos", name = "get-stats",
 @Command(scope = "onos", name = "get-stats",
          description = "Fetches stats for a connection point")
          description = "Fetches stats for a connection point")
-public class GetStatistics extends AbstractShellCommand {
+public class GetStatisticsCommand extends AbstractShellCommand {
 
 
     @Argument(index = 0, name = "connectPoint",
     @Argument(index = 0, name = "connectPoint",
               description = "Device/Port Description",
               description = "Device/Port Description",

@@ -26,11 +26,11 @@ import org.onosproject.net.meter.MeterService;
 import java.util.Collection;
 import java.util.Collection;
 
 
 /**
 /**
- * Add a meter.
+ * Lists all meters.
  */
  */
 @Command(scope = "onos", name = "meters",
 @Command(scope = "onos", name = "meters",
         description = "Shows meters")
         description = "Shows meters")
-public class Meters extends AbstractShellCommand {
+public class MetersListCommand extends AbstractShellCommand {
 
 
     @Argument(index = 0, name = "uri", description = "Device ID",
     @Argument(index = 0, name = "uri", description = "Device ID",
             required = false, multiValued = false)
             required = false, multiValued = false)

@@ -186,13 +186,13 @@
             </completers>
             </completers>
         </command>
         </command>
         <command>
         <command>
-            <action class="org.onosproject.cli.net.AddMeter"/>
+            <action class="org.onosproject.cli.net.AddMeterCommand"/>
             <completers>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
                 <ref component-id="deviceIdCompleter"/>
             </completers>
             </completers>
         </command>
         </command>
         <command>
         <command>
-            <action class="org.onosproject.cli.net.Meters"/>
+            <action class="org.onosproject.cli.net.MetersListCommand"/>
             <completers>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
                 <ref component-id="deviceIdCompleter"/>
             </completers>
             </completers>
@@ -298,13 +298,13 @@
             </optional-completers>
             </optional-completers>
         </command>
         </command>
         <command>
         <command>
-            <action class="org.onosproject.cli.net.GetStatistics"/>
+            <action class="org.onosproject.cli.net.GetStatisticsCommand"/>
             <completers>
             <completers>
                 <ref component-id="connectPointCompleter"/>
                 <ref component-id="connectPointCompleter"/>
             </completers>
             </completers>
         </command>
         </command>
         <command>
         <command>
-            <action class="org.onosproject.cli.net.GetFlowStatistics"/>
+            <action class="org.onosproject.cli.net.GetFlowStatisticsCommand"/>
             <completers>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
                 <ref component-id="deviceIdCompleter"/>
             </completers>
             </completers>