support ubuntu 24 in CI

.github/workflows/build_and_test.yml

@@ -31,6 +31,7 @@ jobs:
           apk update && apk add cppcheck python3-dev
           python3 -m pip install cmake-format clang-format==18.1.6
 
+      # TODO: investigate how to run pre-commit with `venv`
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
 
       - name: CMake format
@@ -52,6 +53,9 @@ jobs:
     strategy:
       matrix:
         include:
+          - image: ubuntu2404
+            python: python3
+            config-zstd: OFF
           - image: ubuntu2204
             python: python3
             config-zstd: OFF
@@ -80,6 +84,19 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
+      - name: Set up Python
+        run: |
+          if [ "${{ matrix.image }}" = "alpine317" ]; then
+            apk add python3 py3-virtualenv py3-virtualenv python3-dev gcc musl-dev linux-headers
+          elif [ "${{ matrix.image }}" = "rhel94" ]; then
+            yum install -y python3 python3-virtualenv python3-devel
+          elif [ "${{ matrix.image }}" = "fedora39" ]; then
+            dnf install -y python3 python3-virtualenv python3-devel
+          else
+            apt-get update
+            apt-get install -y python3 python3-venv python3-dev
+          fi
+
       # Checkout is performed out of the container and doesn't match our user
       - name: Fix checkout ownership
         run: chown -R "$(id -u):$(id -g)" "$GITHUB_WORKSPACE"
@@ -97,15 +114,19 @@ jobs:
         run: cmake --build "$BUILD_DIR" -j
 
       - name: Test PcapPlusPlus
+        shell: bash
         run: |
-          ${{ matrix.python }} -m pip install -U pip
+          ${{ matrix.python }} -m venv ./venv
+          source ./venv/bin/activate
+          ${{ matrix.python }} -m pip install pip
           ${{ matrix.python }} -m pip install -r ci/run_tests/requirements.txt
           ${{ matrix.python }} ci/run_tests/run_tests.py --interface eth0 ${{ matrix.test-flags }}
 
       - name: Test Examples
+        shell: bash
         run: |
+          source ./venv/bin/activate
           cd Tests/ExamplesTest
-          ${{ matrix.python }} -m pip install -U pip
           ${{ matrix.python }} -m pip install -r requirements.txt
           ${{ matrix.python }} -m pytest --interface eth0 --root-path=../../Dist/examples_bin
 
@@ -124,7 +145,9 @@ jobs:
         run: cd build_examples/tutorials_bin && ./Tutorial-HelloWorld
 
       - name: Create Cobertura Report
+        shell: bash
         run: |
+          source ./venv/bin/activate
           ${{ matrix.python }} -m pip install gcovr
           gcovr -v -r . ${{ matrix.additional-gcov-flags }} $GCOVR_FLAGS -o coverage.xml
 
@@ -278,15 +301,16 @@ jobs:
         # We can't run cross compiled binaries
         if: ${{ matrix.arch == 'x86_64' }}
         run: |
-          python -m pip install -U pip
+          python -m venv ./venv
+          source ./venv/bin/activate
+          python -m pip install pip
           python -m pip install -r ci/run_tests/requirements.txt
           python ci/run_tests/run_tests.py --interface en0
 
       - name: Test Examples
         if: ${{ matrix.arch == 'x86_64' }}
         run: |
           cd Tests/ExamplesTest
-          python -m pip install -U pip
           python -m pip install -r requirements.txt
           python -m pytest --interface en0 --use-sudo --root-path=../../Dist/examples_bin
 
@@ -355,14 +379,15 @@ jobs:
 
       - name: Test PcapPlusPlus
         run: |
-          python -m pip install -U pip
+          python -m venv ./venv
+          source ./venv/bin/activate
+          python -m pip install pip
           python -m pip install -r ci/run_tests/requirements.txt
           python ci/run_tests/run_tests.py --interface en0
 
       - name: Test Examples
         run: |
           cd Tests/ExamplesTest
-          python -m pip install -U pip
           python -m pip install -r requirements.txt
           python -m pytest --interface en0 --use-sudo --root-path=../../Dist/examples_bin
 
@@ -602,7 +627,6 @@ jobs:
 
           echo "Testing PcapPlusPlus examples"
           cd Tests/ExamplesTest
-          python3 -m ensurepip
           python3 -m pip install -r requirements.txt
           python3 -m pytest --interface "$interface_name" --root-path=../../Dist/examples_bin
 
@@ -691,9 +715,11 @@ jobs:
 
       - name: Test PcapPlusPlus
         run: |
-          python -m pip install -U pip
-          python  -m pip install -r ci/run_tests/requirements.txt
-          python  ci/run_tests/run_tests.py --interface eth0 --use-sudo --pcap-test-args="-t xdp"
+          python -m venv ./venv
+          source ./venv/bin/activate
+          python -m pip install pip
+          python -m pip install -r ci/run_tests/requirements.txt
+          python ci/run_tests/run_tests.py --interface eth0 --use-sudo --pcap-test-args="-t xdp"
 
       - name: Create Cobertura Report
         run: |

.github/workflows/package.yml

@@ -26,6 +26,8 @@ jobs:
     strategy:
       matrix:
         include:
+          - image: ubuntu2404
+            config-zstd: OFF
           - image: ubuntu2204
             config-zstd: OFF
           - image: ubuntu2204-icpx

ci/run_tests/requirements.txt

@@ -1 +1 @@
-netifaces==0.11.0
+psutil==6.0.0

ci/run_tests/run_tests.py

@@ -1,11 +1,22 @@
 import os
 import subprocess
 import argparse
-import netifaces as ni
+import psutil
+import socket
 
 PCAP_FILE_PATH = os.path.join("Tests", "Pcap++Test", "PcapExamples", "example.pcap")
 
 
+def get_ip_address(interface):
+    addresses = psutil.net_if_addrs().get(interface)
+    if not addresses:
+        return None
+    for address in addresses:
+        if address.family == socket.AF_INET:
+            return address.address
+    return None
+
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("--interface", type=str, required=True, help="interface to use")
@@ -32,7 +43,8 @@ def main():
     )
     args = parser.parse_args()
 
-    ip_address = ni.ifaddresses(args.interface)[ni.AF_INET][0]["addr"]
+    ip_address = get_ip_address(args.interface)
+
     print("IP address is: %s" % ip_address)
 
     try:

ci/run_tests/run_tests_windows.py

@@ -1,14 +1,27 @@
 import os
 import argparse
 import subprocess
-import netifaces as ni
+import psutil
+import socket
 
 TCPREPLAY_PATH = "tcpreplay-4.4.1-win"
 PCAP_FILE_PATH = os.path.abspath(
     os.path.join("Tests", "Pcap++Test", "PcapExamples", "example.pcap")
 )
 
 
+def get_ip_address(interface):
+    print(interface)
+    addresses = psutil.net_if_addrs().get(interface)
+    print(addresses)
+    if not addresses:
+        return None
+    for address in addresses:
+        if address.family == socket.AF_INET:
+            return address.address
+    return None
+
+
 def find_interface():
     completed_process = subprocess.run(
         ["tcpreplay.exe", "--listnics"],
@@ -27,7 +40,7 @@ def find_interface():
             interface = columns[1]
             try:
                 ni_interface = interface.lstrip("\\Device\\NPF_")
-                ip_address = ni.ifaddresses(ni_interface)[ni.AF_INET][0]["addr"]
+                ip_address = get_ip_address(ni_interface)
                 if ip_address.startswith("169.254"):
                     continue
                 completed_process = subprocess.run(
@@ -64,7 +77,7 @@ def main():
 
     tcpreplay_interface, ip_address = find_interface()
     if not tcpreplay_interface or not ip_address:
-        print("Cannot find an interface to run tests on!")
+        print("Cannot find an interface to run tests on! Info from psutil.net_if_addrs() %s"% psutil.net_if_addrs())
         exit(1)
     print(f"Interface is {tcpreplay_interface} and IP address is {ip_address}")