commit a49c60ace73042906160fdb9236b9970f5558454
author Jordan Halterman <jordan@opennetworking.org> Tue May 15 23:01:44 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed Jun 13 21:59:22 2018 +0000
tree 91e72e9faadf1983fef1ff7280d473535b5a9a02
parent 4a082ec0dee17a90849dc4eaef322b426843797a

Use count methods when printing simple flow rule counts via CLI

Change-Id: I2444b0ad913b0bab82b6fe642c89114322d5194b
(cherry picked from commit ca12103eed8b7407a849f7ac09b735bb4ee250bf)

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

diff --git a/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
index 331431a..5c26b06 100644
--- a/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
@@ -119,6 +119,18 @@
 
         compilePredicate();
 
+        if (countOnly && !suppressCoreOutput && filter.isEmpty() && remove == null) {
+            if (uri == null) {
+                deviceService.getDevices().forEach(device -> printCount(device, service));
+            } else {
+                Device device = deviceService.getDevice(DeviceId.deviceId(uri));
+                if (device != null) {
+                    printCount(device, service);
+                }
+            }
+            return;
+        }
+
         SortedMap<Device, List<FlowEntry>> flows = getSortedFlows(deviceService, service, coreService);
 
         // Remove flows
@@ -278,6 +290,10 @@
                 filter(f -> contentFilter.filter(f)).collect(Collectors.toList());
     }
 
+    private void printCount(Device device, FlowRuleService flowRuleService) {
+        print("deviceId=%s, flowRuleCount=%d", device.id(), flowRuleService.getFlowRuleCount(device.id()));
+    }
+
     /**
      * Prints flows.
      *