Bumped supported revisions of P4 tools
Includes:
- Use new P4Runtime "v1" package names
- Removed VALID match
- New table entry priority spec (1 is min priority, not 0)
- Fixed p4c-bm2-ss to include arch flag
- Re-compiled P4 programs with more recent p4c (with updated p4info)
Change-Id: I05908f40eda0f0c755009268fd261fb8bcc9be35
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
index 9b1b7c2..ac88527 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
@@ -647,16 +647,6 @@
MISSING_MEMBER_MESSAGE).asText(), null)
);
break;
- case VALID:
- builder.matchValid(
- PiMatchFieldId.of(
- nullIsIllegal(node.get(CriterionCodec.PI_MATCH_FIELD_ID),
- CriterionCodec.PI_MATCH_FIELD_ID +
- MISSING_MEMBER_MESSAGE).asText()),
- nullIsIllegal(node.get(CriterionCodec.PI_MATCH_VALUE),
- CriterionCodec.PI_MATCH_VALUE +
- MISSING_MEMBER_MESSAGE).asBoolean());
- break;
default:
throw new IllegalArgumentException("Type " + type + " is unsupported");
}
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/EncodeCriterionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/EncodeCriterionCodecHelper.java
index efdc9ff..83b25a7 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/EncodeCriterionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/EncodeCriterionCodecHelper.java
@@ -57,7 +57,6 @@
import org.onosproject.net.pi.runtime.PiLpmFieldMatch;
import org.onosproject.net.pi.runtime.PiRangeFieldMatch;
import org.onosproject.net.pi.runtime.PiTernaryFieldMatch;
-import org.onosproject.net.pi.runtime.PiValidFieldMatch;
import java.util.EnumMap;
@@ -542,16 +541,6 @@
return matchRangeNode;
}
- private ObjectNode parsePiMatchValid(PiValidFieldMatch validFieldMatch) {
-
- ObjectNode matchValidNode = context.mapper().createObjectNode();
- matchValidNode.put(CriterionCodec.PI_MATCH_FIELD_ID, validFieldMatch.fieldId().id());
- matchValidNode.put(CriterionCodec.PI_MATCH_TYPE, PiMatchType.VALID.name().toLowerCase());
- matchValidNode.put(CriterionCodec.PI_MATCH_VALUE, validFieldMatch.isValid());
-
- return matchValidNode;
- }
-
private class FormatProtocolIndependent implements CriterionTypeFormatter {
@Override
public ObjectNode encodeCriterion(ObjectNode root, Criterion criterion) {
@@ -569,13 +558,8 @@
matchNodes.add(parsePiMatchTernary((PiTernaryFieldMatch) fieldMatch));
break;
case RANGE:
-
matchNodes.add(parsePiMatchRange((PiRangeFieldMatch) fieldMatch));
break;
- case VALID:
-
- matchNodes.add(parsePiMatchValid((PiValidFieldMatch) fieldMatch));
- break;
default:
throw new IllegalArgumentException("Type " + fieldMatch.type().name() + " is unsupported");
}
diff --git a/core/common/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java
index c748ab6..2a615c7 100644
--- a/core/common/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java
+++ b/core/common/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java
@@ -51,7 +51,6 @@
import org.onosproject.net.pi.runtime.PiLpmFieldMatch;
import org.onosproject.net.pi.runtime.PiRangeFieldMatch;
import org.onosproject.net.pi.runtime.PiTernaryFieldMatch;
-import org.onosproject.net.pi.runtime.PiValidFieldMatch;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -508,10 +507,6 @@
.matchRange(ipv4MatchFieldId, matchRangeBytes1, matchRangeHighBytes).build();
ObjectNode rangeResult = criterionCodec.encode(rangeBytesCriterion, context);
assertThat(rangeResult, matchesCriterion(rangeBytesCriterion));
-
- Criterion validCriterion = PiCriterion.builder().matchValid(ipv4MatchFieldId, false).build();
- ObjectNode validResult = criterionCodec.encode(validCriterion, context);
- assertThat(validResult, matchesCriterion(validCriterion));
}
/**
@@ -549,12 +544,8 @@
Assert.assertThat(((PiRangeFieldMatch) piFieldMatch).lowValue(),
is(copyFrom((byte) 0x10)));
break;
- case VALID:
- Assert.assertThat(piFieldMatch.fieldId().id(), is("ethernet_t.etherType"));
- Assert.assertThat(((PiValidFieldMatch) piFieldMatch).isValid(), is(true));
- break;
default:
- Assert.assertTrue(false);
+ Assert.fail();
}
}
}
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 0b38729..bda5515 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
@@ -59,7 +59,6 @@
import org.onosproject.net.pi.runtime.PiLpmFieldMatch;
import org.onosproject.net.pi.runtime.PiRangeFieldMatch;
import org.onosproject.net.pi.runtime.PiTernaryFieldMatch;
-import org.onosproject.net.pi.runtime.PiValidFieldMatch;
import static org.onlab.util.ImmutableByteSequence.copyFrom;
@@ -626,13 +625,6 @@
return false;
}
break;
- case VALID:
- if (!Objects.equals(matchNode.get("value").asBoolean(),
- ((PiValidFieldMatch) fieldMatch).isValid())) {
- description.appendText("match value was " + ((PiValidFieldMatch) fieldMatch).isValid());
- return false;
- }
- break;
default:
description.appendText("match type was " + fieldMatch.type().name().toLowerCase());
return false;
diff --git a/core/common/src/test/resources/org/onosproject/codec/impl/PiCriterion.json b/core/common/src/test/resources/org/onosproject/codec/impl/PiCriterion.json
index 01d9226..d1df49e 100644
--- a/core/common/src/test/resources/org/onosproject/codec/impl/PiCriterion.json
+++ b/core/common/src/test/resources/org/onosproject/codec/impl/PiCriterion.json
@@ -23,11 +23,6 @@
"match": "range",
"highValue": "20",
"lowValue": "10"
- },
- {
- "field": "ethernet_t.etherType",
- "match": "valid",
- "value": true
}
]
-}
\ No newline at end of file
+}