Updates to P4 tools for 2024-Sep-01 (#633)

Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>

Author: jafingerhut

utils/p4runtime_lib/helper.py

@@ -26,7 +26,8 @@ def __init__(self, p4_info_filepath):
         p4info = p4info_pb2.P4Info()
         # Load the p4info file into a skeleton P4Info object
         with open(p4_info_filepath) as p4info_f:
-            google.protobuf.text_format.Merge(p4info_f.read(), p4info)
+            google.protobuf.text_format.Merge(p4info_f.read(), p4info,
+                                              allow_unknown_field=True)
         self.p4info = p4info
 
     def get(self, entity_type, name=None, id=None):

vm-ubuntu-24.04/patches/p4runtime-shell-2023-changes.patch

@@ -1,3 +1,16 @@
+diff --git a/p4runtime_sh/p4runtime.py b/p4runtime_sh/p4runtime.py
+index f858f92..85ef344 100644
+--- a/p4runtime_sh/p4runtime.py
++++ b/p4runtime_sh/p4runtime.py
+@@ -289,7 +289,7 @@ class P4RuntimeClient:
+         with open(p4info_path, 'r') as f1:
+             with open(bin_path, 'rb') as f2:
+                 try:
+-                    google.protobuf.text_format.Merge(f1.read(), req.config.p4info)
++                    google.protobuf.text_format.Merge(f1.read(), req.config.p4info, allow_unknown_field=True)
+                 except google.protobuf.text_format.ParseError:
+                     logging.error("Error when parsing P4Info")
+                     raise
 diff --git a/setup.cfg b/setup.cfg
 index 07c5c31..8a9dad9 100644
 --- a/setup.cfg

vm-ubuntu-24.04/user-dev-bootstrap.sh

@@ -15,10 +15,10 @@ change_owner_and_group_of_venv_lib_python3_files() {
 set -xe
 
 #Src
-BMV2_COMMIT="a8e2947aefe660d11df53ff44854d112d545db38"  # 2024-Aug-01
-PI_COMMIT="05cb92564af77ae4826565cbde84e3fd4960c6bd"    # 2024-Aug-01
-P4C_COMMIT="a7d6e351c016843cab60fb62aa233c1279512edd"   # 2024-Aug-01
-PTF_COMMIT="c554f83685186be4cfa9387eb5d6d700d2bbd7c0"   # 2024-Aug-01
+BMV2_COMMIT="ec328ab87fe10cea0e061a4d9eb15408fb49729a"  # 2024-Sep-01
+PI_COMMIT="5eae9c84d7a55f9554775e498b9146f67eac7bd4"    # 2024-Sep-01
+P4C_COMMIT="3306162acd9e60e06c5574dc28d67df71a78cbad"   # 2024-Sep-01
+PTF_COMMIT="c554f83685186be4cfa9387eb5d6d700d2bbd7c0"   # 2024-Sep-01
 
 # Versions installed by Ubuntu apt
 PROTOBUF_PKG_VERSION="3.21.12"