wip, generate config with capture

Sakoram · Sakoram · commit 8050d01debb3 · 2025-12-22T15:34:32.000Z
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -1,4 +1,5 @@
 name: Build
+description: Build MTL and ecosystem plugins
 runs:
   using: composite
   steps:
@@ -16,6 +17,32 @@ runs:
         path: 'ffmpeg'
     - name: 'configuration: Install the build dependency'
       run: |
+        set -euo pipefail
+
+        # Self-hosted runners can keep dpkg state between jobs. If `ntp` is half-configured,
+        # any subsequent apt operation can fail with: "dpkg returned an error code (1)".
+        # Also, avoid starting services during package install (and especially avoid time-sync
+        # daemons fighting over UDP/123).
+        sudo tee /usr/sbin/policy-rc.d >/dev/null <<'EOF'
+        #!/bin/sh
+        exit 101
+        EOF
+        sudo chmod +x /usr/sbin/policy-rc.d
+
+        sudo systemctl stop ntp 2>/dev/null || true
+        sudo systemctl disable ntp 2>/dev/null || true
+        sudo systemctl stop systemd-timesyncd 2>/dev/null || true
+        sudo systemctl stop chrony 2>/dev/null || true
+        sudo systemctl stop chronyd 2>/dev/null || true
+
+        if dpkg-query -W -f='${Status}' ntp 2>/dev/null | grep -q '^install'; then
+          sudo dpkg --remove --force-remove-reinstreq ntp 2>/dev/null || true
+          sudo apt-get remove --purge -y ntp || true
+        fi
+
+        sudo dpkg --configure -a || true
+        sudo apt-get -f install -y || true
+
         sudo apt update
         sudo apt-get remove -y pipenv || true
         sudo apt-get install -y \
@@ -43,6 +70,8 @@ runs:
             libgstreamer-plugins-base1.0-dev \
             patch \
             unzip
+
+          sudo rm -f /usr/sbin/policy-rc.d
       shell: bash
     - name: 'installation: Build mtl'
       run: |
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -63,6 +63,20 @@ jobs:
         run: |
           runner_name=${{ runner.name }}
           echo "SESSION_ID=${runner_name##*-}" >> "$GITHUB_ENV"
+
+      - name: Export GitHub job id for PCAP naming
+        if: ${{ needs.smoke-check-for-changes.outputs.changed == 'true' }}
+        shell: bash
+        run: |
+          echo "MTL_GITHUB_JOB=${{ github.workflow }}:${{ github.job }}:${{ matrix.nic }}" >> "$GITHUB_ENV"
+
+      - name: Install requirements
+        if: ${{ needs.smoke-check-for-changes.outputs.changed == 'true' }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          sudo apt-get update -y
+          sudo apt-get install -y --no-install-recommends linuxptp ethtool netsniff-ng jq
       - name: Set PCI device env variable
         if: ${{ needs.smoke-check-for-changes.outputs.changed == 'true' }}
         run: |
@@ -82,19 +96,71 @@ jobs:
             --build ${{ secrets.RUNNER_BUILD }} \
             --mtl_path ${{ secrets.RUNNER_MTL_PATH }} \
             --pci_device ${{ env.PCI_DEVICE }} \
+            --ebu_ip ${{ secrets.RUNNER_EBU_LIST_IP }} \
+            --ebu_user ${{ secrets.RUNNER_EBU_LIST_USER }} \
+            --ebu_password ${{ secrets.RUNNER_EBU_LIST_PASSWORD }} \
             --ip_address 127.0.0.1 \
             --username ${{ secrets.RUNNER_USERNAME }} \
             --key_path ${{ secrets.RUNNER_KEY_PATH }}
+
+      - name: Detect capture PTP device (2nd PF)
+        if: ${{ needs.smoke-check-for-changes.outputs.changed == 'true' }}
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          echo "PCI_DEVICE=${PCI_DEVICE}"
+
+          mapfile -t bdfs < <(lspci -Dn | awk -v id="$PCI_DEVICE" '$3 == id { print $1 }' | sort)
+          if [ "${#bdfs[@]}" -lt 1 ]; then
+            echo "ERROR: no PCI functions found matching ${PCI_DEVICE}"
+            exit 1
+          fi
+
+          # Prefer the 2nd PF when present.
+          capture_bdf="${bdfs[1]:-${bdfs[0]}}"
+          if [ ! -d "/sys/bus/pci/devices/${capture_bdf}/net" ]; then
+            echo "ERROR: no netdevs under /sys/bus/pci/devices/${capture_bdf}/net"
+            ls -la "/sys/bus/pci/devices/${capture_bdf}" || true
+            exit 1
+          fi
+
+          capture_iface="$(ls "/sys/bus/pci/devices/${capture_bdf}/net" | head -n 1)"
+          if [ -z "${capture_iface}" ]; then
+            echo "ERROR: failed to detect interface name for ${capture_bdf}"
+            exit 1
+          fi
+
+          ptp_idx="$(sudo ethtool -T "${capture_iface}" 2>/dev/null | awk -F': ' '/PTP Hardware Clock:/ {print $2; exit}')"
+          if ! [[ "${ptp_idx}" =~ ^[0-9]+$ ]]; then
+            echo "ERROR: failed to parse PTP Hardware Clock index for ${capture_iface}"
+            sudo ethtool -T "${capture_iface}" || true
+            exit 1
+          fi
+
+          echo "CAPTURE_BDF=${capture_bdf}" >> "$GITHUB_ENV"
+          echo "CAPTURE_IFACE=${capture_iface}" >> "$GITHUB_ENV"
+          echo "CAPTURE_PTP=/dev/ptp${ptp_idx}" >> "$GITHUB_ENV"
+          echo "Capture interface: ${capture_iface} (${capture_bdf}), PTP: /dev/ptp${ptp_idx}"
       - name: 'preparation: Kill MtlManager and pytest routines'
         if: ${{ needs.smoke-check-for-changes.outputs.changed == 'true' }}
         run: |
           sudo killall -SIGINT pipenv || true
           sudo killall -SIGINT pytest || true
           sudo killall -SIGINT MtlManager || true
+          sudo killall -SIGINT phc2sys || true
       - name: 'preparation: Start MtlManager at background'
         if: ${{ needs.smoke-check-for-changes.outputs.changed == 'true' }}
         run: |
           sudo MtlManager &
+
+      - name: 'preparation: Start phc2sys for capture interface'
+        if: ${{ needs.smoke-check-for-changes.outputs.changed == 'true' }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          echo "Starting phc2sys: ${CAPTURE_PTP} -> CLOCK_REALTIME (iface=${CAPTURE_IFACE})"
+          sudo phc2sys -s "${CAPTURE_PTP}" -c CLOCK_REALTIME -O 0 -m &
       - name: 'execution: Run validation-bare-metal tests in virtual environment'
         if: ${{ needs.smoke-check-for-changes.outputs.changed == 'true' }}
         run: |
diff --git a/tests/validation/configs/gen_config.py b/tests/validation/configs/gen_config.py
@@ -3,22 +3,35 @@
 import yaml
 
 
-def gen_test_config(session_id: int, build: str, mtl_path: str) -> str:
+def gen_test_config(
+    session_id: int,
+    build: str,
+    mtl_path: str,
+    pci_device: str,
+    ebu_ip: str,
+    ebu_user: str,
+    ebu_password: str,
+) -> str:
     test_config = {
         "session_id": session_id,
         "build": build,
         "mtl_path": mtl_path,
         "media_path": "/mnt/media",
         "ramdisk": {
             "media": {"mountpoint": "/mnt/ramdisk/media", "size_gib": 32},
-            "pcap": {"mountpoint": "/mnt/ramdisk/pcap", "size_gib": 768},
+            "tmpfs_size_gib": 12,
+            "pcap_dir": "/mnt/ramdisk/pcap",
+        },
+        "compliance": True,
+        "capture_cfg": {
+            "enable": True,
+            "pcap_dir": "/mnt/ramdisk/pcap",
+            "sniff_pci_device": pci_device,
         },
-        "compliance": False,
-        "capture_cfg": {"enable": False, "pcap_dir": "/mnt/ramdisk/pcap"},
         "ebu_server": {
-            "ebu_ip": "ebu_ip",
-            "user": "user",
-            "password": "password",
+            "ebu_ip": ebu_ip,
+            "user": ebu_user,
+            "password": ebu_password,
             "proxy": False,
         },
     }
@@ -39,6 +52,10 @@ def gen_topology_config(
                     {
                         "pci_device": pci_device,
                         "interface_index": 0,
+                    },
+                    {
+                        "pci_device": pci_device,
+                        "interface_index": 1,
                     }
                 ],
                 "connections": [
@@ -91,6 +108,24 @@ def main() -> None:
         required=True,
         help="specify PCI ID of the NIC",
     )
+    parser.add_argument(
+        "--ebu_ip",
+        type=str,
+        required=True,
+        help="EBU LIST server IP/hostname (RUNNER_EBU_LIST_IP)",
+    )
+    parser.add_argument(
+        "--ebu_user",
+        type=str,
+        required=True,
+        help="EBU LIST username (RUNNER_EBU_LIST_USER)",
+    )
+    parser.add_argument(
+        "--ebu_password",
+        type=str,
+        required=True,
+        help="EBU LIST password (RUNNER_EBU_LIST_PASSWORD)",
+    )
     parser.add_argument(
         "--ip_address",
         type=str,
@@ -121,7 +156,13 @@ def main() -> None:
     with open("test_config.yaml", "w") as file:
         file.write(
             gen_test_config(
-                session_id=args.session_id, build=args.build, mtl_path=args.mtl_path
+                session_id=args.session_id,
+                build=args.build,
+                mtl_path=args.mtl_path,
+                pci_device=args.pci_device,
+                ebu_ip=args.ebu_ip,
+                ebu_user=args.ebu_user,
+                ebu_password=args.ebu_password,
             )
         )
     with open("topology_config.yaml", "w") as file:
diff --git a/tests/validation/conftest.py b/tests/validation/conftest.py
@@ -374,7 +374,7 @@ def pcap_capture(request, media_file, test_config, hosts, mtl_path):
             f" --ip {ebu_ip}"
             f" --user {ebu_login}"
             f" --password {ebu_passwd}"
-            f" --pcap {capturer.pcap_file}{proxy_cmd}",
+            f" --pcap '{capturer.pcap_file}'{proxy_cmd}",
             cwd=f"{str(mtl_path)}",
         )
         if compliance_upl.return_code != 0:
diff --git a/tests/validation/create_pcap_file/netsniff.py b/tests/validation/create_pcap_file/netsniff.py
@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2025 Intel Corporation
+import datetime
 import logging
 import os
+import re
 from time import sleep
 
 from mfd_connect.exceptions import (
@@ -59,7 +61,7 @@ def __init__(
         self.host = host
         self.test_name = test_name
         self.pcap_dir = pcap_dir
-        self.pcap_file = f"'{os.path.join(pcap_dir, test_name)}.pcap'"
+        self.pcap_file = None
         if interface is not None:
             self.interface = interface
         else:
@@ -70,20 +72,52 @@ def __init__(
         self.packets_capture = packets_capture
         self.capture_time = capture_time
 
+    @staticmethod
+    def _sanitize_filename_component(value: str, *, max_len: int = 64) -> str:
+        cleaned = re.sub(r"[^A-Za-z0-9._-]+", "-", (value or "").strip())
+        cleaned = cleaned.strip("-._")
+        if not cleaned:
+            cleaned = "unknown"
+        return cleaned[:max_len]
+
+    def _get_remote_hostname(self) -> str:
+        try:
+            res = self.host.connection.execute_command("uname -n")
+            hostname = (res.stdout or "").strip().splitlines()[0]
+            if hostname:
+                return hostname
+        except Exception:
+            pass
+        return str(getattr(self.host, "name", "unknown"))
+
+    def _build_pcap_path(self) -> str:
+        hostname = self._sanitize_filename_component(self._get_remote_hostname())
+        timestamp = datetime.datetime.now(datetime.timezone.utc).strftime("%Y%m%dT%H%M%SZ")
+        job = os.environ.get("MTL_GITHUB_JOB") or os.environ.get("GITHUB_JOB") or ""
+        job = self._sanitize_filename_component(job, max_len=96) if job else ""
+
+        test = self._sanitize_filename_component(self.test_name, max_len=128)
+        parts = [test, hostname, timestamp]
+        if job:
+            parts.append(job)
+        filename = "__".join(parts) + ".pcap"
+        return os.path.join(self.pcap_dir, filename)
+
     def start(self):
         """
         Starts the netsniff-ng
         """
         if not self.netsniff_process or not self.netsniff_process.running:
             connection = self.host.connection
             try:
+                self.pcap_file = self._build_pcap_path()
                 cmd = [
                     "netsniff-ng",
                     "--silent" if self.silent else "",
                     "--in",
                     str(self.interface),
                     "--out",
-                    self.pcap_file,
+                    f"'{self.pcap_file}'",
                     (
                         f"--num {self.packets_capture}"
                         if self.packets_capture is not None
@@ -96,7 +130,7 @@ def start(self):
                     " ".join(cmd), stderr_to_stdout=True
                 )
                 logger.info(
-                    f"PCAP file will be saved at: {os.path.abspath(self.pcap_file)}"
+                    f"PCAP file will be saved at: {self.pcap_file}"
                 )
 
                 if not self.netsniff_process.running:

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ def pcap_capture(request, media_file, test_config, hosts, mtl_path):`
`374`	`374`	`f" --ip {ebu_ip}"`
`375`	`375`	`f" --user {ebu_login}"`
`376`	`376`	`f" --password {ebu_passwd}"`
`377`		`- f" --pcap {capturer.pcap_file}{proxy_cmd}",`
	`377`	`+ f" --pcap '{capturer.pcap_file}'{proxy_cmd}",`
`378`	`378`	`cwd=f"{str(mtl_path)}",`
`379`	`379`	`)`
`380`	`380`	`if compliance_upl.return_code != 0:`