P4 Developer Day May 2019 (#252)

* Update user-bootstrap to use latest version (#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
2019-04-25 21:21:47 -04:00
parent 201fcf59a8
commit 01fc378076
50 changed files with 59 additions and 57 deletions
--- 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
--- 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) {
--- 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": [
    {
--- 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": [
    {
--- 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": [
    {
--- 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) {
--- 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
--- 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) {
--- 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": [
    {
--- 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": [
    {
--- 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": [
    {
--- 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) {
--- a/exercises/other/ecn/Makefile
+++ b/exercises/other/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
--- a/exercises/other/ecn/README.md
+++ b/exercises/other/ecn/README.md
--- a/exercises/other/ecn/ecn.p4
+++ b/exercises/other/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) {
--- a/exercises/other/ecn/receive.py
+++ b/exercises/other/ecn/receive.py
--- a/exercises/other/ecn/s1-runtime.json
+++ b/exercises/other/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": [
    {
--- a/exercises/other/ecn/s2-runtime.json
+++ b/exercises/other/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": [
    {
--- a/exercises/other/ecn/s3-runtime.json
+++ b/exercises/other/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": [
    {
--- a/exercises/other/ecn/send.py
+++ b/exercises/other/ecn/send.py
--- a/exercises/other/ecn/setup.png
+++ b/exercises/other/ecn/setup.png
--- a/exercises/other/ecn/solution/ecn.p4
+++ b/exercises/other/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) {
--- a/exercises/other/ecn/topology.json
+++ b/exercises/other/ecn/topology.json
--- 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
--- 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 = {
--- 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": [
    {
--- 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": [
    {
--- 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": [
    {
--- 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 = {
--- 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
--- 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) {
--- 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": [
    {
--- 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": [
    {
--- 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": [
    {
--- 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) {
--- 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
--- 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) {
--- a/exercises/p4runtime/mycontroller.py
+++ b/exercises/p4runtime/mycontroller.py
@@ -190,7 +190,7 @@ if __name__ == '__main__':
    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')
--- a/exercises/p4runtime/solution/mycontroller.py
+++ b/exercises/p4runtime/solution/mycontroller.py
@@ -215,7 +215,7 @@ if __name__ == '__main__':
    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')
--- 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
--- 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": [ ]
 } 
--- 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": [ ]
 } 
--- 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": [ ]
 } 
--- 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() {
--- 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() {