commit 6af4e17c53a8220127b91c637c8ad08ce51a8bdb
author Carmelo Cascone <carmelo@opennetworking.org> Fri Jun 15 16:01:30 2018 +0200
committer Carmelo Cascone <carmelo@opennetworking.org> Fri Jun 15 19:04:30 2018 +0000
tree 184179cf96f0dcdf0ac87d8ef29d2b540a9e48ae
parent 25747d88f7ad5a6dd7c3c3e7617f0fca6c0fa6bc

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

core/common/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java

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();
             }
         }
     }