sigtype selector and treatment and fix not finding the switch id in test app.
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 2e177f7..9d8ab7b 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
@@ -162,6 +162,17 @@
}
/**
+ * Creates a match on lambda field using the specified value.
+ *
+ * @param lambda
+ * @return match criterion
+ */
+ public static Criterion matchOpticalSignalType(Byte lambda) {
+ return new OpticalSignalTypeCriterion(lambda, Type.OCH_SIGTYPE);
+ }
+
+
+ /**
* Implementations of criteria.
*/
public static final class PortCriterion implements Criterion {
@@ -577,4 +588,48 @@
}
}
+ public static final class OpticalSignalTypeCriterion implements Criterion {
+
+ private final byte signalType;
+ private final Type type;
+
+ public OpticalSignalTypeCriterion(byte signalType, Type type) {
+ this.signalType = signalType;
+ this.type = type;
+ }
+
+ @Override
+ public Type type() {
+ return this.type;
+ }
+
+ public Byte signalType() {
+ return this.signalType;
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("signalType", signalType).toString();
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(signalType, type);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj instanceof OpticalSignalTypeCriterion) {
+ OpticalSignalTypeCriterion that = (OpticalSignalTypeCriterion) obj;
+ return Objects.equals(signalType, that.signalType) &&
+ Objects.equals(type, that.type);
+ }
+ return false;
+ }
+ }
+
}