Try testing with Scapy version updated to 2.5.0

.github/workflows/build.yml

@@ -11,41 +11,53 @@ on:
 
 jobs:
   verify-python:
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, ubuntu-latest]
+        scapy_version: [2.5.0, 2.6.1]
+      # Don't abort other runs when one of them fails, to ease debugging.
+      fail-fast: false
+
     name: Python code verification (src)
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
         run: |
           make set-dev
-          python -m pip install scapy==2.4.5
+          python -m pip install scapy==${{ matrix.scapy_version }}
       - name: Verify code (python w/black)
         run: |
           make format-check
       - name: Run pytests (utests/tests)
         run: | 
           make test
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, ubuntu-latest]
+        scapy_version: [2.5.0, 2.6.1]
+      # Don't abort other runs when one of them fails, to ease debugging.
+      fail-fast: false
+
+    name: run ptf unit tests
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
 
     - name: Dependencies
       run: |
         sudo apt-get install cmake libffi-dev ethtool python3-dev
-        # Install the latest pip version (not python3-pip) as older versions
-        # seem to have issues when installing from source.
-        curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-        sudo python3 get-pip.py
-        sudo python3 -m pip install --upgrade setuptools nose2 scapy wheel
+        python3 -m pip install --upgrade setuptools nose2 wheel
+        python -m pip install scapy==${{ matrix.scapy_version }}
 
         bash CI/install-nanomsg.sh
         sudo ldconfig
         bash CI/install-nnpy.sh
 
     - name: Install
       run: |
-        sudo python3 -m pip install .
+        python3 -m pip install .
         ptf --version
 
     - name: Before_script
@@ -54,6 +66,6 @@ jobs:
 
     - name: Script
       run: |
+        pip --verbose list
         python3 CI/check-nnpy.py
         ./CI/run_tests.sh
-        sudo python3 /usr/local/bin/nose2 utests.tests.test

CI/install-nanomsg.sh

@@ -3,6 +3,9 @@
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 source $THIS_DIR/common.sh
 
+set -x
+cmake --version
+
 # nanomsg is very confusing in how it manages SOVERSION vs VERSION, but this
 # should be okay... (5.0.0 is the SOVERSION)
 check_lib libnanomsg libnanomsg.so.5.0.0

CI/install-nnpy.sh

@@ -2,7 +2,7 @@
 set -e
 git clone https://github.com/nanomsg/nnpy.git
 cd nnpy
-sudo python3 -m pip install cffi
-sudo python3 -m pip install --upgrade cffi
-sudo python3 -m pip install .
+python3 -m pip install cffi
+python3 -m pip install --upgrade cffi
+python3 -m pip install .
 cd ..

CI/python-major-minor-version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+import sys
+
+print(f"{sys.version_info.major}.{sys.version_info.minor}")

CI/run_tests.sh

@@ -1,23 +1,36 @@
 #!/usr/bin/env bash
 
-sudo python ptf_nn/ptf_nn_agent.py \
+set -x
+
+THIS_SCRIPT_FILE_MAYBE_RELATIVE="$0"
+THIS_SCRIPT_DIR_MAYBE_RELATIVE="${THIS_SCRIPT_FILE_MAYBE_RELATIVE%/*}"
+THIS_SCRIPT_DIR_ABSOLUTE=`readlink -f "${THIS_SCRIPT_DIR_MAYBE_RELATIVE}"`
+
+MAJOR_MINOR_VERSION=`${THIS_SCRIPT_DIR_ABSOLUTE}/python-major-minor-version.py`
+PPATH="$HOME/.local/lib/python${MAJOR_MINOR_VERSION}/site-packages"
+
+sudo PATH=${PATH} PYTHONPATH=${PPATH} python3 ptf_nn/ptf_nn_agent.py \
     --device-socket 0@tcp://127.0.0.1:10001 -i 0-1@veth0 \
-    &>/dev/null &
+    &
 
 sleep 5
 
-sudo python ptf_nn/ptf_nn_agent.py \
+sudo PATH=${PATH} PYTHONPATH=${PPATH} python3 ptf_nn/ptf_nn_agent.py \
     --device-socket 1@tcp://127.0.0.1:10002 -i 1-1@veth3 \
-    &>/dev/null &
+    &
 
 sleep 5
 
-sudo python ptf_nn/ptf_nn_test_bridge.py -ifrom veth1 -ito veth2 \
-    &>/dev/null &
+sudo PATH=${PATH} PYTHONPATH=${PPATH} python3 ptf_nn/ptf_nn_test_bridge.py -ifrom veth1 -ito veth2 \
+    &
 
 sleep 5
 
-sudo ptf --test-dir ptf_nn/ptf_nn_test \
+env
+
+sudo PATH=${PATH} PYTHONPATH=${PPATH} `which ptf` --test-dir ptf_nn/ptf_nn_test \
     --device-socket 0-{0-64}@tcp://127.0.0.1:10001 \
     --device-socket 1-{0-64}@tcp://127.0.0.1:10002 \
     --platform nn
+
+sudo PATH=${PATH} PYTHONPATH=${PPATH} python3 `which nose2` utests.tests.test

README.md

@@ -42,15 +42,15 @@ More information about Black, you find at
 The following software is required to run PTF:
 
  * Python 3.x
- * Scapy 2.4.5 (unless you provide another packet manipulation module)
+ * Scapy 2.5.0 (unless you provide another packet manipulation module)
  * pypcap (optional - VLAN tests will fail without this)
  * tcpdump (optional - Scapy will complain if it's missing)
 
 Root/sudo privilege is required on the host, in order to run `ptf`.
 
 The default packet manipulator tool for `ptf` is `Scapy`. To install it use:
 ```text
-pip install scapy==2.4.5
+pip install scapy==2.5.0
 ```
 
 To enable VLAN tests, you need to install `pypcap`: