flows cmd pretty print
Change-Id: I29b0971a5a862c602f8cd36f864f173c6d8330d6
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
index e27cc4d..758c51c 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
@@ -1,5 +1,7 @@
package org.onlab.onos.net.flow.criteria;
+import static com.google.common.base.MoreObjects.toStringHelper;
+
import org.onlab.onos.net.PortNumber;
import org.onlab.onos.net.flow.criteria.Criterion.Type;
import org.onlab.packet.IpPrefix;
@@ -129,6 +131,12 @@
public PortNumber port() {
return this.port;
}
+
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("port", port).toString();
+ }
}
@@ -149,6 +157,13 @@
public MacAddress mac() {
return this.mac;
}
+
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("mac", mac).toString();
+ }
+
}
public static final class EthTypeCriterion implements Criterion {
@@ -168,6 +183,12 @@
return ethType;
}
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("ethType", Long.toHexString(ethType)).toString();
+ }
+
}
@@ -190,6 +211,11 @@
return this.ip;
}
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("ip", ip).toString();
+ }
}
@@ -211,6 +237,12 @@
return proto;
}
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("protocol", Long.toHexString(proto)).toString();
+ }
+
}
@@ -231,6 +263,12 @@
return vlanPcp;
}
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("pcp", Long.toHexString(vlanPcp)).toString();
+ }
+
}
@@ -252,6 +290,12 @@
return vlanId;
}
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("id", vlanId).toString();
+ }
+
}