Updates to P4 tools for 2024-Oct-15 (#640)

Signed-off-by: Andy Fingerhut <andy.fingerhut@gmail.com>

Author: jafingerhut

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

@@ -1,16 +1,3 @@
-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="ec328ab87fe10cea0e061a4d9eb15408fb49729a"  # 2024-Sep-01
-PI_COMMIT="5eae9c84d7a55f9554775e498b9146f67eac7bd4"    # 2024-Sep-01
-P4C_COMMIT="3306162acd9e60e06c5574dc28d67df71a78cbad"   # 2024-Sep-01
-PTF_COMMIT="c554f83685186be4cfa9387eb5d6d700d2bbd7c0"   # 2024-Sep-01
+BMV2_COMMIT="199af48e04ea8747f8296bdc51c2ce16bb96cb04"  # 2024-Oct-15
+PI_COMMIT="5eae9c84d7a55f9554775e498b9146f67eac7bd4"    # 2024-Oct-15
+P4C_COMMIT="9fcd7d5985f22ae6ff437a30dfb613a1347d8079"   # 2024-Oct-15
+PTF_COMMIT="c554f83685186be4cfa9387eb5d6d700d2bbd7c0"   # 2024-Oct-15
 
 # Versions installed by Ubuntu apt
 PROTOBUF_PKG_VERSION="3.21.12"
@@ -121,7 +121,10 @@ debug_dump_many_install_files $HOME/usr-local-5-after-behavioral-model.txt
 # Starting in 2019-Nov, Python3 version of Scapy is needed for `cd
 # p4c/build ; make check` to succeed.
 # ply package is needed for ebpf and ubpf backend tests to pass
-pip3 install scapy ply
+# TODO: It appears that some changes were made from scapy 2.5.0 to
+# 2.6.0 that require changes in P4 open source tools in order to use
+# version 2.6.0.  Until those changes are made, install scapy 2.5.0.
+pip3 install scapy==2.5.0 ply
 git clone https://github.com/p4lang/p4c
 cd p4c
 git checkout ${P4C_COMMIT}