commit 8791a8100b922fb3cd0ad7f84cfb01e55f255fca
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Feb 10 09:43:52 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 11 06:20:59 2015 +0000
tree dd21be433eba32e4aaa4456c6fe4a6c92b51abbd
parent 552e31f991a5cd06e3db22d95b8c5324147098ba

Modified flows command to only output flows for specified device

 for ONOS-1003

Change-Id: Ibbb313b80618bd9db806c2c63c50a6b45ccf800e

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 8cea446..e0b98ed 100644
--- a/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
@@ -19,7 +19,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Maps;
+
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.core.CoreService;
@@ -37,9 +37,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static org.onosproject.cli.net.DevicesListCommand.getSortedDevices;
 
 /**
  * Lists all currently-known hosts.
@@ -68,14 +69,12 @@
         CoreService coreService = get(CoreService.class);
         DeviceService deviceService = get(DeviceService.class);
         FlowRuleService service = get(FlowRuleService.class);
-        Map<Device, List<FlowEntry>> flows = getSortedFlows(deviceService, service);
+        SortedMap<Device, List<FlowEntry>> flows = getSortedFlows(deviceService, service);
 
         if (outputJson()) {
-            print("%s", json(coreService, getSortedDevices(deviceService), flows));
+            print("%s", json(coreService, flows.keySet(), flows));
         } else {
-            for (Device d : getSortedDevices(deviceService)) {
-                printFlows(d, flows.get(d), coreService);
-            }
+            flows.forEach((device, flow) -> printFlows(device, flow, coreService));
         }
     }
 
@@ -145,9 +144,9 @@
      * @param service flow rule service
      * @return sorted device list
      */
-    protected Map<Device, List<FlowEntry>> getSortedFlows(DeviceService deviceService,
+    protected SortedMap<Device, List<FlowEntry>> getSortedFlows(DeviceService deviceService,
                                                           FlowRuleService service) {
-        Map<Device, List<FlowEntry>> flows = Maps.newHashMap();
+        SortedMap<Device, List<FlowEntry>> flows = new TreeMap<>(Comparators.ELEMENT_COMPARATOR);
         List<FlowEntry> rules;
         FlowEntryState s = null;
         if (state != null && !state.equals("any")) {
@@ -166,7 +165,7 @@
                     }
                 }
             }
-            Collections.sort(rules, Comparators.FLOW_RULE_COMPARATOR);
+            rules.sort(Comparators.FLOW_RULE_COMPARATOR);
             flows.put(d, rules);
         }
         return flows;