Add JSON codec for ETH_DST_MASKED Criterion
- Enabling for a mcast flow rule to fetch its mask value from JSON dump
Change-Id: I8a69b0244dc332605d14e40998c329802a921286
(cherry picked from commit b62492324b4f913349ff7ed3e0ed3014b3f8f660)
diff --git a/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java b/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java
index bda5515..b19ee53 100644
--- a/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java
+++ b/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java
@@ -137,6 +137,14 @@
description.appendText("mac was " + jsonMac);
return false;
}
+ if (criterion.type() == Criterion.Type.ETH_DST_MASKED) {
+ final String macMask = criterion.mask().toString();
+ final String jsonMacMask = jsonCriterion.get("macMask").textValue();
+ if (!macMask.equals(jsonMacMask)) {
+ description.appendText("macMask was " + jsonMacMask);
+ return false;
+ }
+ }
return true;
}
@@ -657,6 +665,7 @@
return matchCriterion((MetadataCriterion) criterion);
case ETH_DST:
+ case ETH_DST_MASKED:
case ETH_SRC:
return matchCriterion((EthCriterion) criterion);