P4 Developer Day May 2019 (p4lang#252)

jnfoster · web-flow · commit 01fc37807601 · 2019-04-25T21:21:47.000-04:00
* Update user-bootstrap to use latest version (p4lang#251) * p4c tests are failing in latest version. So, let's skip it during vagrant provisioning * Update tutorial to use latest version of P4 tools Modify switch.py to handle setting default_action Use --p4runtime-files instead of deprecated --p4runtime-file and --p4runtime-format flags Provide standard_metadata for mark_to_drop * Fix path for ECN exercise
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ you get started with P4 programming, organized into several modules:
 * [P4Runtime](./exercises/p4runtime)
 
 3. Monitoring and Debugging
-* [Explicit Congestion Notification](./exercises/other/ecn)
+* [Explicit Congestion Notification](./exercises/ecn)
 * [Multi-Hop Route Inspection](./exercises/mri)
 
 4. Advanced Behavior
diff --git a/exercises/basic/Makefile b/exercises/basic/Makefile
@@ -1,5 +1,5 @@
 BMV2_SWITCH_EXE = simple_switch_grpc
 NO_P4 = true
-P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
+P4C_ARGS = --p4runtime-files $(basename $@).p4.p4info.txt
 
 include ../../utils/Makefile
diff --git a/exercises/basic/basic.p4 b/exercises/basic/basic.p4
@@ -75,7 +75,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/basic/s1-runtime.json b/exercises/basic/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4info",
+  "p4info": "build/basic.p4.p4info.txt",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
diff --git a/exercises/basic/s2-runtime.json b/exercises/basic/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4info",
+  "p4info": "build/basic.p4.p4info.txt",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
diff --git a/exercises/basic/s3-runtime.json b/exercises/basic/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4info",
+  "p4info": "build/basic.p4.p4info.txt",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
diff --git a/exercises/basic/solution/basic.p4 b/exercises/basic/solution/basic.p4
@@ -87,7 +87,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/basic_tunnel/Makefile b/exercises/basic_tunnel/Makefile
@@ -1,5 +1,5 @@
 BMV2_SWITCH_EXE = simple_switch_grpc
 NO_P4 = true
-P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
+P4C_ARGS = --p4runtime-files $(basename $@).p4.p4info.txt
 
 include ../../utils/Makefile
diff --git a/exercises/basic_tunnel/basic_tunnel.p4 b/exercises/basic_tunnel/basic_tunnel.p4
@@ -99,7 +99,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/basic_tunnel/s1-runtime.json b/exercises/basic_tunnel/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic_tunnel.p4info",
+  "p4info": "build/basic_tunnel.p4.p4info.txt",
   "bmv2_json": "build/basic_tunnel.json",
   "table_entries": [
     {
diff --git a/exercises/basic_tunnel/s2-runtime.json b/exercises/basic_tunnel/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic_tunnel.p4info",
+  "p4info": "build/basic_tunnel.p4.p4info.txt",
   "bmv2_json": "build/basic_tunnel.json",
   "table_entries": [
     {
diff --git a/exercises/basic_tunnel/s3-runtime.json b/exercises/basic_tunnel/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic_tunnel.p4info",
+  "p4info": "build/basic_tunnel.p4.p4info.txt",
   "bmv2_json": "build/basic_tunnel.json",
   "table_entries": [
     {
diff --git a/exercises/basic_tunnel/solution/basic_tunnel.p4 b/exercises/basic_tunnel/solution/basic_tunnel.p4
@@ -103,7 +103,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/ecn/Makefile b/exercises/ecn/Makefile
@@ -1,5 +1,5 @@
 BMV2_SWITCH_EXE = simple_switch_grpc
 NO_P4 = true
-P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
+P4C_ARGS = --p4runtime-files $(basename $@).p4.p4info.txt
 
 include ../../utils/Makefile
diff --git a/exercises/ecn/README.md b/exercises/ecn/README.md
diff --git a/exercises/ecn/ecn.p4 b/exercises/ecn/ecn.p4
@@ -91,7 +91,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/ecn/receive.py b/exercises/ecn/receive.py
diff --git a/exercises/ecn/s1-runtime.json b/exercises/ecn/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/ecn.p4info",
+  "p4info": "build/ecn.p4.p4info.txt",
   "bmv2_json": "build/ecn.json",
   "table_entries": [
     {
diff --git a/exercises/ecn/s2-runtime.json b/exercises/ecn/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/ecn.p4info",
+  "p4info": "build/ecn.p4.p4info.txt",
   "bmv2_json": "build/ecn.json",
   "table_entries": [
     {
diff --git a/exercises/ecn/s3-runtime.json b/exercises/ecn/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/ecn.p4info",
+  "p4info": "build/ecn.p4.p4info.txt",
   "bmv2_json": "build/ecn.json",
   "table_entries": [
     {
diff --git a/exercises/ecn/send.py b/exercises/ecn/send.py
diff --git a/exercises/ecn/setup.png b/exercises/ecn/setup.png
diff --git a/exercises/ecn/solution/ecn.p4 b/exercises/ecn/solution/ecn.p4
@@ -89,7 +89,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/ecn/topology.json b/exercises/ecn/topology.json
diff --git a/exercises/load_balance/Makefile b/exercises/load_balance/Makefile
@@ -1,5 +1,5 @@
 BMV2_SWITCH_EXE = simple_switch_grpc
 NO_P4 = true
-P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
+P4C_ARGS = --p4runtime-files $(basename $@).p4.p4info.txt
 
 include ../../utils/Makefile
diff --git a/exercises/load_balance/load_balance.p4 b/exercises/load_balance/load_balance.p4
@@ -99,7 +99,7 @@ control MyIngress(inout headers hdr,
                   inout standard_metadata_t standard_metadata) {
 
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     action set_ecmp_select(bit<16> ecmp_base, bit<32> ecmp_count) {
         /* TODO: hash on 5-tuple and save the hash result in meta.ecmp_select 
@@ -151,7 +151,7 @@ control MyEgress(inout headers hdr,
         hdr.ethernet.srcAddr = smac;
     }
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     table send_frame {
         key = {
diff --git a/exercises/load_balance/s1-runtime.json b/exercises/load_balance/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/load_balance.p4info",
+  "p4info": "build/load_balance.p4.p4info.txt",
   "bmv2_json": "build/load_balance.json",
   "table_entries": [
     {
diff --git a/exercises/load_balance/s2-runtime.json b/exercises/load_balance/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/load_balance.p4info",
+  "p4info": "build/load_balance.p4.p4info.txt",
   "bmv2_json": "build/load_balance.json",
   "table_entries": [
     {
diff --git a/exercises/load_balance/s3-runtime.json b/exercises/load_balance/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/load_balance.p4info",
+  "p4info": "build/load_balance.p4.p4info.txt",
   "bmv2_json": "build/load_balance.json",
   "table_entries": [
     {
diff --git a/exercises/load_balance/solution/load_balance.p4 b/exercises/load_balance/solution/load_balance.p4
@@ -99,7 +99,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     action set_ecmp_select(bit<16> ecmp_base, bit<32> ecmp_count) {
         hash(meta.ecmp_select,
@@ -158,7 +158,7 @@ control MyEgress(inout headers hdr,
         hdr.ethernet.srcAddr = smac;
     }
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     table send_frame {
         key = {
diff --git a/exercises/mri/Makefile b/exercises/mri/Makefile
@@ -1,5 +1,5 @@
 BMV2_SWITCH_EXE = simple_switch_grpc
 NO_P4 = true
-P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
+P4C_ARGS = --p4runtime-files $(basename $@).p4.p4info.txt
 
 include ../../utils/Makefile
diff --git a/exercises/mri/mri.p4 b/exercises/mri/mri.p4
@@ -161,7 +161,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/mri/s1-runtime.json b/exercises/mri/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/mri.p4info",
+  "p4info": "build/mri.p4.p4info.txt",
   "bmv2_json": "build/mri.json",
   "table_entries": [
     {
diff --git a/exercises/mri/s2-runtime.json b/exercises/mri/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/mri.p4info",
+  "p4info": "build/mri.p4.p4info.txt",
   "bmv2_json": "build/mri.json",
   "table_entries": [
     {
diff --git a/exercises/mri/s3-runtime.json b/exercises/mri/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/mri.p4info",
+  "p4info": "build/mri.p4.p4info.txt",
   "bmv2_json": "build/mri.json",
   "table_entries": [
     {
diff --git a/exercises/mri/solution/mri.p4 b/exercises/mri/solution/mri.p4
@@ -153,7 +153,7 @@ control MyIngress(inout headers hdr,
                   inout metadata meta,
                   inout standard_metadata_t standard_metadata) {
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/p4runtime/Makefile b/exercises/p4runtime/Makefile
@@ -1,5 +1,5 @@
 BMV2_SWITCH_EXE = simple_switch_grpc
 NO_P4 = true
-P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
+P4C_ARGS = --p4runtime-files $(basename $@).p4.p4info.txt
 
 include ../../utils/Makefile
diff --git a/exercises/p4runtime/advanced_tunnel.p4 b/exercises/p4runtime/advanced_tunnel.p4
@@ -108,7 +108,7 @@ control MyIngress(inout headers hdr,
     counter(MAX_TUNNEL_ID, CounterType.packets_and_bytes) egressTunnelCounter;
 
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
diff --git a/exercises/p4runtime/mycontroller.py b/exercises/p4runtime/mycontroller.py
@@ -190,7 +190,7 @@ def main(p4info_file_path, bmv2_file_path):
     parser = argparse.ArgumentParser(description='P4Runtime Controller')
     parser.add_argument('--p4info', help='p4info proto in text format from p4c',
                         type=str, action="store", required=False,
-                        default='./build/advanced_tunnel.p4info')
+                        default='./build/advanced_tunnel.p4.p4info.txt')
     parser.add_argument('--bmv2-json', help='BMv2 JSON file from p4c',
                         type=str, action="store", required=False,
                         default='./build/advanced_tunnel.json')
diff --git a/exercises/p4runtime/solution/mycontroller.py b/exercises/p4runtime/solution/mycontroller.py
@@ -215,7 +215,7 @@ def main(p4info_file_path, bmv2_file_path):
     parser = argparse.ArgumentParser(description='P4Runtime Controller')
     parser.add_argument('--p4info', help='p4info proto in text format from p4c',
                         type=str, action="store", required=False,
-                        default='./build/advanced_tunnel.p4info')
+                        default='./build/advanced_tunnel.p4.p4info.txt')
     parser.add_argument('--bmv2-json', help='BMv2 JSON file from p4c',
                         type=str, action="store", required=False,
                         default='./build/advanced_tunnel.json')
diff --git a/exercises/source_routing/Makefile b/exercises/source_routing/Makefile
@@ -1,5 +1,5 @@
 BMV2_SWITCH_EXE = simple_switch_grpc
 NO_P4 = true
-P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
+P4C_ARGS = --p4runtime-files $(basename $@).p4.p4info.txt
 
 include ../../utils/Makefile
diff --git a/exercises/source_routing/s1-runtime.json b/exercises/source_routing/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/source_routing.p4info",
+  "p4info": "build/source_routing.p4.p4info.txt",
   "bmv2_json": "build/source_routing.json",
   "table_entries": [ ]
 } 
diff --git a/exercises/source_routing/s2-runtime.json b/exercises/source_routing/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/source_routing.p4info",
+  "p4info": "build/source_routing.p4.p4info.txt",
   "bmv2_json": "build/source_routing.json",
   "table_entries": [ ]
 } 
diff --git a/exercises/source_routing/s3-runtime.json b/exercises/source_routing/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/source_routing.p4info",
+  "p4info": "build/source_routing.p4.p4info.txt",
   "bmv2_json": "build/source_routing.json",
   "table_entries": [ ]
 } 
diff --git a/exercises/source_routing/solution/source_routing.p4 b/exercises/source_routing/solution/source_routing.p4
@@ -106,7 +106,7 @@ control MyIngress(inout headers hdr,
                   inout standard_metadata_t standard_metadata) {
 
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action srcRoute_nhop() {
diff --git a/exercises/source_routing/source_routing.p4 b/exercises/source_routing/source_routing.p4
@@ -110,7 +110,7 @@ control MyIngress(inout headers hdr,
                   inout standard_metadata_t standard_metadata) {
 
     action drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     action srcRoute_nhop() {
diff --git a/utils/p4runtime_lib/error_utils.py b/utils/p4runtime_lib/error_utils.py
@@ -17,7 +17,8 @@
 
 from google.rpc import status_pb2, code_pb2
 import grpc
-from p4 import p4runtime_pb2
+from p4.v1 import p4runtime_pb2
+from p4.v1 import p4runtime_pb2_grpc
 
 # Used to indicate that the gRPC error Status object returned by the server has
 # an incorrect format.
diff --git a/utils/p4runtime_lib/helper.py b/utils/p4runtime_lib/helper.py
@@ -15,8 +15,8 @@
 import re
 
 import google.protobuf.text_format
-from p4 import p4runtime_pb2
-from p4.config import p4info_pb2
+from p4.v1 import p4runtime_pb2
+from p4.config.v1 import p4info_pb2
 
 from convert import encode
 
@@ -97,10 +97,7 @@ def get_match_field_pb(self, table_name, match_field_name, value):
         p4runtime_match = p4runtime_pb2.FieldMatch()
         p4runtime_match.field_id = p4info_match.id
         match_type = p4info_match.match_type
-        if match_type == p4info_pb2.MatchField.VALID:
-            valid = p4runtime_match.valid
-            valid.value = bool(value)
-        elif match_type == p4info_pb2.MatchField.EXACT:
+        if match_type == p4info_pb2.MatchField.EXACT:
             exact = p4runtime_match.exact
             exact.value = encode(value, bitwidth)
         elif match_type == p4info_pb2.MatchField.LPM:
diff --git a/utils/p4runtime_lib/switch.py b/utils/p4runtime_lib/switch.py
diff --git a/vm/user-bootstrap.sh b/vm/user-bootstrap.sh

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ control MyIngress(inout headers hdr,`
`75`	`75`	`inout metadata meta,`
`76`	`76`	`inout standard_metadata_t standard_metadata) {`
`77`	`77`	`action drop() {`
`78`		`- mark_to_drop();`
	`78`	`+ mark_to_drop(standard_metadata);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"target": "bmv2",`
`3`		`- "p4info": "build/basic.p4info",`
	`3`	`+ "p4info": "build/basic.p4.p4info.txt",`
`4`	`4`	`"bmv2_json": "build/basic.json",`
`5`	`5`	`"table_entries": [`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ control MyIngress(inout headers hdr,`
`87`	`87`	`inout metadata meta,`
`88`	`88`	`inout standard_metadata_t standard_metadata) {`
`89`	`89`	`action drop() {`
`90`		`- mark_to_drop();`
	`90`	`+ mark_to_drop(standard_metadata);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ control MyIngress(inout headers hdr,`
`99`	`99`	`inout metadata meta,`
`100`	`100`	`inout standard_metadata_t standard_metadata) {`
`101`	`101`	`action drop() {`
`102`		`- mark_to_drop();`
	`102`	`+ mark_to_drop(standard_metadata);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"target": "bmv2",`
`3`		`- "p4info": "build/basic_tunnel.p4info",`
	`3`	`+ "p4info": "build/basic_tunnel.p4.p4info.txt",`
`4`	`4`	`"bmv2_json": "build/basic_tunnel.json",`
`5`	`5`	`"table_entries": [`
`6`	`6`	`{`