Improvements to flows list command.
* Added -s option which gives more succinct output.
* Display each flow on one line for easy grepping.
* Added ability to filter output by table ID.
* Flows are now sorted by descending priority within a table.
* Removed the use of toStringHelper in instructions and criterion to produce
less verbose output.
Change-Id: I1c874c776491386488ea5a4d23627b20f1e5728b
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpPaCriterion.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpPaCriterion.java
index ba5a03d..f14c7e1 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpPaCriterion.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpPaCriterion.java
@@ -15,12 +15,10 @@
*/
package org.onosproject.net.flow.criteria;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import org.onlab.packet.Ip4Address;
import java.util.Objects;
-import org.onlab.packet.Ip4Address;
-
/**
* Implementation of arp spa or tpa address criterion.
*/
@@ -56,8 +54,7 @@
@Override
public String toString() {
- return toStringHelper(type().toString())
- .add("ip", ip).toString();
+ return type().toString() + SEPARATOR + ip;
}
@Override
@@ -77,4 +74,4 @@
}
return false;
}
-}
\ No newline at end of file
+}