Skip to content

Commit ffd07f2

Browse files
authored
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 <andy_fingerhut@alum.wustl.edu>
1 parent 50a6560 commit ffd07f2

44 files changed

Lines changed: 84 additions & 84 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

exercises/basic/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ each switch. These are defined in the `sX-runtime.json` files, where
9191
**Important:** We use P4Runtime to install the control plane rules. The
9292
content of files `sX-runtime.json` refer to specific names of tables, keys, and
9393
actions, as defined in the P4Info file produced by the compiler (look for the
94-
file `build/basic.p4.p4info.txt` after executing `make run`). Any changes in the P4
94+
file `build/basic.p4.p4info.txtpb` after executing `make run`). Any changes in the P4
9595
program that add or rename tables, keys, or actions will need to be reflected in
9696
these `sX-runtime.json` files.
9797

exercises/basic/pod-topo/s1-runtime.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic.p4.p4info.txt",
3+
"p4info": "build/basic.p4.p4info.txtpb",
44
"bmv2_json": "build/basic.json",
55
"table_entries": [
66
{

exercises/basic/pod-topo/s2-runtime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic.p4.p4info.txt",
3+
"p4info": "build/basic.p4.p4info.txtpb",
44
"bmv2_json": "build/basic.json",
55
"table_entries": [
66
{
@@ -66,4 +66,4 @@
6666
}
6767
}
6868
]
69-
}
69+
}

exercises/basic/pod-topo/s3-runtime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic.p4.p4info.txt",
3+
"p4info": "build/basic.p4.p4info.txtpb",
44
"bmv2_json": "build/basic.json",
55
"table_entries": [
66
{
@@ -66,4 +66,4 @@
6666
}
6767
}
6868
]
69-
}
69+
}

exercises/basic/pod-topo/s4-runtime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic.p4.p4info.txt",
3+
"p4info": "build/basic.p4.p4info.txtpb",
44
"bmv2_json": "build/basic.json",
55
"table_entries": [
66
{
@@ -66,4 +66,4 @@
6666
}
6767
}
6868
]
69-
}
69+
}

exercises/basic/triangle-topo/s1-runtime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic.p4.p4info.txt",
3+
"p4info": "build/basic.p4.p4info.txtpb",
44
"bmv2_json": "build/basic.json",
55
"table_entries": [
66
{
@@ -52,4 +52,4 @@
5252
}
5353
}
5454
]
55-
}
55+
}

exercises/basic/triangle-topo/s2-runtime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic.p4.p4info.txt",
3+
"p4info": "build/basic.p4.p4info.txtpb",
44
"bmv2_json": "build/basic.json",
55
"table_entries": [
66
{
@@ -52,4 +52,4 @@
5252
}
5353
}
5454
]
55-
}
55+
}

exercises/basic/triangle-topo/s3-runtime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic.p4.p4info.txt",
3+
"p4info": "build/basic.p4.p4info.txtpb",
44
"bmv2_json": "build/basic.json",
55
"table_entries": [
66
{
@@ -52,4 +52,4 @@
5252
}
5353
}
5454
]
55-
}
55+
}

exercises/basic_tunnel/s1-runtime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic_tunnel.p4.p4info.txt",
3+
"p4info": "build/basic_tunnel.p4.p4info.txtpb",
44
"bmv2_json": "build/basic_tunnel.json",
55
"table_entries": [
66
{
@@ -82,4 +82,4 @@
8282
}
8383
}
8484
]
85-
}
85+
}

exercises/basic_tunnel/s2-runtime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"target": "bmv2",
3-
"p4info": "build/basic_tunnel.p4.p4info.txt",
3+
"p4info": "build/basic_tunnel.p4.p4info.txtpb",
44
"bmv2_json": "build/basic_tunnel.json",
55
"table_entries": [
66
{
@@ -82,4 +82,4 @@
8282
}
8383
}
8484
]
85-
}
85+
}

0 commit comments

Comments
 (0)