commit f988bf5e4e5126241b40f7cdab8e5a11b7f1491d
author jcc <jiangchuncheng@huawei.com> Tue May 05 19:02:50 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Wed May 20 22:22:29 2015 +0000
tree 6b7d916900b19dd82557799e5e1662e55f9ea25b
parent 75874dae515d5271709a56a271b882304211f964

【ONOS-1871】Provide CLI support on flowrule subsystem extension for QA
purposes。
Create a new test application to apply a flow rule to a third-party
random device automatically.
and modfiy FlowsListCommand to show third-party flow rule.

Change-Id: I8902b1577c91c43a7755afd4c1c40fc5ba87d54f

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 f123df6..0be9bd4 100644
--- a/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
@@ -15,6 +15,8 @@
  */
 package org.onosproject.cli.net;
 
+import static com.google.common.collect.Lists.newArrayList;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -38,10 +40,8 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import static com.google.common.collect.Lists.newArrayList;
-
 /**
- * Lists all currently-known hosts.
+ * Lists all currently-known flows.
  */
 @Command(scope = "onos", name = "flows",
          description = "Lists all currently-known flows.")
@@ -50,7 +50,7 @@
     public static final String ANY = "any";
 
     private static final String FMT =
-            "   id=%s, state=%s, bytes=%s, packets=%s, duration=%s, priority=%s, tableId=%s, timeout=%s, appId=%s";
+            "   id=%s, state=%s, bytes=%s, packets=%s, duration=%s, priority=%s, tableId=%s appId=%s, payLoad=%s";
     private static final String TFMT = "      treatment=%s";
     private static final String SFMT = "      selector=%s";
 
@@ -156,7 +156,8 @@
             for (FlowEntry f : flows) {
                 print(FMT, Long.toHexString(f.id().value()), f.state(),
                       f.bytes(), f.packets(), f.life(), f.priority(), f.tableId(),
-                      f.timeout(), coreService.getAppId(f.appId()).name());
+                      coreService.getAppId(f.appId()).name(),
+                      f.payLoad() == null ? null : f.payLoad().payLoad().toString());
                 print(SFMT, f.selector().criteria());
                 print(TFMT, f.treatment());
             }