Use PTF version with bf_pktpy as default.

Signed-off-by: fruffy <fruffy@nyu.edu>

Author: fruffy

CMakeLists.txt

@@ -284,10 +284,6 @@ find_python_module (re REQUIRED)
 # other packages
 find_package (Doxygen)
 find_package (BMV2)
-# If we have found simple switch or psa switch or pna_nic, we also need scapy.
-if(SIMPLE_SWITCH OR PSA_SWITCH OR PNA_NIC)
-    find_python_module (scapy REQUIRED)
-endif()
 # enable CTest
 enable_testing ()
 

backends/ebpf/tests/test.sh

@@ -180,6 +180,7 @@ for xdp_enabled in "${XDP[@]}" ; do
     # Start tests
     ptf \
       --test-dir ptf/ \
+      --packet-manipulation-module ptf.packet_scapy \
       --test-params="$TEST_PARAMS" \
       --interface 0@s1-eth0 --interface 1@s1-eth1 --interface 2@s1-eth2 --interface 3@s1-eth3 \
       --interface 4@s1-eth4 --interface 5@s1-eth5 $TEST_CASE

pyproject.toml

@@ -11,7 +11,6 @@ license = "Apache"
 dependencies = [
     "pyroute2==0.7.3",
     "ply==3.11",
-    "scapy==2.5.0",
     "googleapis-common-protos==1.53.0",
     "grpcio<=1.75.1,>=1.67.0; python_version > '3.6'",
     "grpcio==1.48.2 ; python_version <= '3.6'",
@@ -39,7 +38,7 @@ package = false
 # FIXME: We should figure out a way to synchronize P4Runtime versions across CMake and Python.
 # This is the same commit hash as defined in the top-level CMakelists.txt
 p4runtime = { git = "https://github.com/p4lang/p4runtime.git", rev = "ec4eb5ef70dbcbcbf2f8357a4b2b8c2f218845a5", subdirectory = "py" }
-ptf = { git = "https://github.com/p4lang/ptf.git", rev = "d016cdfe99f2d609cc9c7fd7f8c414b56d5b3c5c"}
+ptf = { git = "https://github.com/p4lang/ptf.git", rev = "3415cb3036b805512136fd85ad553fcdf6e932db"}
 
 [build-system]
 requires = ["hatchling"]

tools/ci-build.sh

@@ -190,6 +190,7 @@ function build_ebpf() {
                  net-tools"
   P4C_EBPF_DEPS+=" llvm clang "
   sudo apt-get install -y --no-install-recommends ${P4C_EBPF_DEPS}
+  uv pip install scapy==2.5.0
 }
 
 function install_ptf_ebpf_test_deps() (