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/instructions/L1ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L1ModificationInstruction.java
index b72dd7b..9a76520 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/L1ModificationInstruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/L1ModificationInstruction.java
@@ -17,12 +17,12 @@
import org.onosproject.net.OduSignalId;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
import java.util.Objects;
public abstract class L1ModificationInstruction implements Instruction {
+ public static final String SEPARATOR = ":";
+
/**
* Represents the type of traffic treatment.
*/
@@ -79,9 +79,7 @@
@Override
public String toString() {
- return toStringHelper(this)
- .add("oduSignalId", oduSignalId)
- .toString();
+ return subtype().toString() + SEPARATOR + oduSignalId;
}
}