Updates to use the suffix 'txtpb' instead of 'txt' for P4Info files (#…

…637) p4c has had a warning about 'txt' being deprecated in favor of 'txtpb' since 2024-Jan. Signed-off-by: Andy Fingerhut <[email protected]>
p4lang · Oct 16, 2024 · ffd07f2 · ffd07f2
1 parent 50a6560
commit ffd07f2
Show file tree

Hide file tree

Showing 44 changed files with 84 additions and 84 deletions.
diff --git a/exercises/basic/README.md b/exercises/basic/README.md
@@ -91,7 +91,7 @@ each switch. These are defined in the `sX-runtime.json` files, where
 **Important:** We use P4Runtime to install the control plane rules. The
 content of files `sX-runtime.json` refer to specific names of tables, keys, and
 actions, as defined in the P4Info file produced by the compiler (look for the
-file `build/basic.p4.p4info.txt` after executing `make run`). Any changes in the P4
+file `build/basic.p4.p4info.txtpb` after executing `make run`). Any changes in the P4
 program that add or rename tables, keys, or actions will need to be reflected in
 these `sX-runtime.json` files.
 

diff --git a/exercises/basic/pod-topo/s1-runtime.json b/exercises/basic/pod-topo/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {

diff --git a/exercises/basic/pod-topo/s2-runtime.json b/exercises/basic/pod-topo/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -66,4 +66,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/basic/pod-topo/s3-runtime.json b/exercises/basic/pod-topo/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -66,4 +66,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/basic/pod-topo/s4-runtime.json b/exercises/basic/pod-topo/s4-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -66,4 +66,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/basic/triangle-topo/s1-runtime.json b/exercises/basic/triangle-topo/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -52,4 +52,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/basic/triangle-topo/s2-runtime.json b/exercises/basic/triangle-topo/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -52,4 +52,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/basic/triangle-topo/s3-runtime.json b/exercises/basic/triangle-topo/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -52,4 +52,4 @@
       }
     }
   ]
-}
+}
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.p4.p4info.txt",
+  "p4info": "build/basic_tunnel.p4.p4info.txtpb",
   "bmv2_json": "build/basic_tunnel.json",
   "table_entries": [
     {
@@ -82,4 +82,4 @@
       }
     }
   ]
-}
+}
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.p4.p4info.txt",
+  "p4info": "build/basic_tunnel.p4.p4info.txtpb",
   "bmv2_json": "build/basic_tunnel.json",
   "table_entries": [
     {
@@ -82,4 +82,4 @@
       }
     }
   ]
-}
+}
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.p4.p4info.txt",
+  "p4info": "build/basic_tunnel.p4.p4info.txtpb",
   "bmv2_json": "build/basic_tunnel.json",
   "table_entries": [
     {
@@ -82,4 +82,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/calc/s1-runtime.json b/exercises/calc/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/calc.p4.p4info.txt",
+  "p4info": "build/calc.p4.p4info.txtpb",
   "bmv2_json": "build/calc.json",
   "table_entries": []
-}
+}
diff --git a/exercises/ecn/s1-runtime.json b/exercises/ecn/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/ecn.p4.p4info.txt",
+  "p4info": "build/ecn.p4.p4info.txtpb",
   "bmv2_json": "build/ecn.json",
   "table_entries": [
     {
@@ -60,4 +60,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/ecn/s2-runtime.json b/exercises/ecn/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/ecn.p4.p4info.txt",
+  "p4info": "build/ecn.p4.p4info.txtpb",
   "bmv2_json": "build/ecn.json",
   "table_entries": [
     {
@@ -60,4 +60,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/ecn/s3-runtime.json b/exercises/ecn/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/ecn.p4.p4info.txt",
+  "p4info": "build/ecn.p4.p4info.txtpb",
   "bmv2_json": "build/ecn.json",
   "table_entries": [
     {
@@ -46,4 +46,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/firewall/README.md b/exercises/firewall/README.md
@@ -107,7 +107,7 @@ each switch. These are defined in the `sX-runtime.json` files, where
 **Important:** We use P4Runtime to install the control plane rules. The
 content of files `sX-runtime.json` refer to specific names of tables, keys, and
 actions, as defined in the P4Info file produced by the compiler (look for the
-file `build/firewall.p4.p4info.txt` after executing `make run`). Any changes in the P4
+file `build/firewall.p4.p4info.txtpb` after executing `make run`). Any changes in the P4
 program that add or rename tables, keys, or actions will need to be reflected in
 these `sX-runtime.json` files.
 
@@ -226,4 +226,4 @@ The documentation for P4_16 and P4Runtime is available [here](https://p4.org/spe
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
-2. The include file `v1model.p4` has extensive comments and can be accessed [here](https://github.com/p4lang/p4c/blob/master/p4include/v1model.p4).
+2. The include file `v1model.p4` has extensive comments and can be accessed [here](https://github.com/p4lang/p4c/blob/master/p4include/v1model.p4).
diff --git a/exercises/firewall/pod-topo/s1-runtime.json b/exercises/firewall/pod-topo/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/firewall.p4.p4info.txt",
+  "p4info": "build/firewall.p4.p4info.txtpb",
   "bmv2_json": "build/firewall.json",
   "table_entries": [
     {
@@ -154,4 +154,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/firewall/pod-topo/s2-runtime.json b/exercises/firewall/pod-topo/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -66,4 +66,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/firewall/pod-topo/s3-runtime.json b/exercises/firewall/pod-topo/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -66,4 +66,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/firewall/pod-topo/s4-runtime.json b/exercises/firewall/pod-topo/s4-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/basic.p4.p4info.txt",
+  "p4info": "build/basic.p4.p4info.txtpb",
   "bmv2_json": "build/basic.json",
   "table_entries": [
     {
@@ -66,4 +66,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/link_monitor/README.md b/exercises/link_monitor/README.md
@@ -137,7 +137,7 @@ each switch. These are defined in the `sX-runtime.json` files, where
 **Important:** We use P4Runtime to install the control plane rules. The
 content of files `sX-runtime.json` refer to specific names of tables, keys, and
 actions, as defined in the P4Info file produced by the compiler (look for the
-file `build/link_monitor.p4.p4info.txt` after executing `make run`). Any
+file `build/link_monitor.p4.p4info.txtpb` after executing `make run`). Any
 changes in the P4 program that add or rename tables, keys, or actions
 will need to be reflected in these `sX-runtime.json` files.
 
@@ -233,4 +233,4 @@ The documentation for P4_16 and P4Runtime is available [here](https://p4.org/spe
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
-2. The include file `v1model.p4` has extensive comments and can be accessed [here](https://github.com/p4lang/p4c/blob/master/p4include/v1model.p4).
+2. The include file `v1model.p4` has extensive comments and can be accessed [here](https://github.com/p4lang/p4c/blob/master/p4include/v1model.p4).
diff --git a/exercises/link_monitor/pod-topo/s1-runtime.json b/exercises/link_monitor/pod-topo/s1-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/link_monitor.p4.p4info.txt",
+  "p4info": "build/link_monitor.p4.p4info.txtpb",
   "bmv2_json": "build/link_monitor.json",
   "table_entries": [
     {
@@ -74,4 +74,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/link_monitor/pod-topo/s2-runtime.json b/exercises/link_monitor/pod-topo/s2-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/link_monitor.p4.p4info.txt",
+  "p4info": "build/link_monitor.p4.p4info.txtpb",
   "bmv2_json": "build/link_monitor.json",
   "table_entries": [
     {
@@ -74,4 +74,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/link_monitor/pod-topo/s3-runtime.json b/exercises/link_monitor/pod-topo/s3-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/link_monitor.p4.p4info.txt",
+  "p4info": "build/link_monitor.p4.p4info.txtpb",
   "bmv2_json": "build/link_monitor.json",
   "table_entries": [
     {
@@ -74,4 +74,4 @@
       }
     }
   ]
-}
+}
diff --git a/exercises/link_monitor/pod-topo/s4-runtime.json b/exercises/link_monitor/pod-topo/s4-runtime.json
@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/link_monitor.p4.p4info.txt",
+  "p4info": "build/link_monitor.p4.p4info.txtpb",
   "bmv2_json": "build/link_monitor.json",
   "table_entries": [
     {
@@ -74,4 +74,4 @@
       }
     }
   ]
-}
+}
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.p4.p4info.txt",
+  "p4info": "build/load_balance.p4.p4info.txtpb",
   "bmv2_json": "build/load_balance.json",
   "table_entries": [
     {
@@ -68,4 +68,4 @@
       }
     }
   ]
-}
+}
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.p4.p4info.txt",
+  "p4info": "build/load_balance.p4.p4info.txtpb",
   "bmv2_json": "build/load_balance.json",
   "table_entries": [
     {
@@ -46,4 +46,4 @@
       }
     }
   ]
-}
+}