Merge branch 'main' into library_check

Author: DawidWesierski4

tests/validation/configs/test_config.yaml

@@ -4,11 +4,13 @@ media_path: /mnt/media
 capture_cfg:
   enable: false
   test_name: test_name
-  pcap_dir: /home/ubuntu/pcap_files
+  pcap_dir: /mnt/ramdisk/pcap
   capture_time: 5
   interface: null
 ramdisk:
-  pcap_dir: /home/ubuntu/pcap_files
-  tmpfs_size: 768G
-  tmpfs_name: tmpfs_name
-  use_sudo: true
+  media: 
+    mountpoint: /mnt/ramdisk/media
+    size_gib: 32
+  pcap:
+    mountpoint: /mnt/ramdisk/pcap
+    size_gib: 768

tests/validation/conftest.py

@@ -1,6 +1,7 @@
-# # SPDX-License-Identifier: BSD-3-Clause
-# # Copyright 2024-2025 Intel Corporation
-# # Media Communications Mesh
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2024-2025 Intel Corporation
+# Media Communications Mesh
+
 import datetime
 import logging
 import os
@@ -10,15 +11,16 @@
 
 import pytest
 from common.nicctl import Nicctl
-from create_pcap_file.ramdisk import RamdiskPreparer
 from mfd_common_libs.custom_logger import add_logging_level
 from mfd_common_libs.log_levels import TEST_FAIL, TEST_INFO, TEST_PASS
+from mfd_connect.exceptions import ConnectionCalledProcessError
 from mtl_engine.const import LOG_FOLDER, TESTCMD_LVL
 from mtl_engine.csv_report import (
     csv_add_test,
     csv_write_report,
     update_compliance_result,
 )
+from mtl_engine.ramdisk import Ramdisk
 from mtl_engine.stash import (
     clear_issue,
     clear_result_log,
@@ -111,8 +113,8 @@ def nic_port_list(hosts: dict, mtl_path) -> None:
     for host in hosts.values():
         nicctl = Nicctl(mtl_path, host)
         if int(host.network_interfaces[0].virtualization.get_current_vfs()) == 0:
-            vfs = nicctl.create_vfs(host.network_interfaces[0].pci_address)
-        vfs = nicctl.vfio_list()
+            vfs = nicctl.create_vfs(host.network_interfaces[0].pci_address.lspci)
+        vfs = nicctl.vfio_list(host.network_interfaces[0].pci_address.lspci)
         # Store VFs on the host object for later use
         host.vfs = vfs
 
@@ -135,20 +137,60 @@ def prepare_ramdisk(hosts, test_config):
     ramdisk_cfg = test_config.get("ramdisk", {})
     capture_cfg = test_config.get("capture_cfg", {})
     pcap_dir = ramdisk_cfg.get("pcap_dir", "/home/pcap_files")
-    tmpfs_size = ramdisk_cfg.get("tmpfs_size", "768G")
-    tmpfs_name = ramdisk_cfg.get("tmpfs_name", "new_disk_name")
-    use_sudo = ramdisk_cfg.get("use_sudo", True)
+    tmpfs_size_gib = ramdisk_cfg.get("tmpfs_size_gib", "768")
 
     if capture_cfg.get("enable", False):
-        for host in hosts.values():
-            preparer = RamdiskPreparer(
-                host=host,
-                pcap_dir=pcap_dir,
-                tmpfs_size=tmpfs_size,
-                tmpfs_name=tmpfs_name,
-                use_sudo=use_sudo,
+        ramdisks = [
+            Ramdisk(host=host, mount_point=pcap_dir, size_gib=tmpfs_size_gib)
+            for host in hosts.values()
+        ]
+        for ramdisk in ramdisks:
+            ramdisk.mount()
+
+
+@pytest.fixture(scope="session")
+def media_ramdisk(hosts, test_config):
+    ramdisk_config = test_config.get("ramdisk", {}).get("media", {})
+    ramdisk_mountpoint = ramdisk_config.get("mountpoint", "/mnt/ramdisk/media")
+    ramdisk_size_gib = ramdisk_config.get("size_gib", 32)
+    ramdisks = [
+        Ramdisk(host=host, mount_point=ramdisk_mountpoint, size_gib=ramdisk_size_gib)
+        for host in hosts.values()
+    ]
+    for ramdisk in ramdisks:
+        ramdisk.mount()
+    yield
+    for ramdisk in ramdisks:
+        ramdisk.unmount()
+
+
+@pytest.fixture(scope="function")
+def media_file(media_ramdisk, request, hosts, test_config):
+    media_file_info = request.param
+    ramdisk_config = test_config.get("ramdisk", {}).get("media", {})
+    ramdisk_mountpoint = ramdisk_config.get("mountpoint", "/mnt/ramdisk/media")
+    media_path = test_config.get("media_path", "/mnt/media")
+    src_media_file_path = os.path.join(media_path, media_file_info["filename"])
+    ramdisk_media_file_path = os.path.join(
+        ramdisk_mountpoint, media_file_info["filename"]
+    )
+    for host in hosts.values():
+        cmd = f"cp {src_media_file_path} {ramdisk_media_file_path}"
+        try:
+            host.connection.execute_command(cmd)
+        except ConnectionCalledProcessError as e:
+            logging.log(
+                level=logging.ERROR, msg=f"Failed to execute command {cmd}: {e}"
+            )
+    yield media_file_info, ramdisk_media_file_path
+    for host in hosts.values():
+        cmd = f"rm {ramdisk_media_file_path}"
+        try:
+            host.connection.execute_command(cmd)
+        except ConnectionCalledProcessError as e:
+            logging.log(
+                level=logging.ERROR, msg=f"Failed to execute command {cmd}: {e}"
             )
-            preparer.start()
 
 
 def pytest_addoption(parser):

tests/validation/create_pcap_file/ramdisk.py

@@ -366,27 +366,31 @@
         "format": "YUV_422_10bit",
         "width": 720,
         "height": 480,
+        "fps": "60",
     },
     ParkJoy_576p={
         "filename": "ParkJoy_720x576_interlace_10bit_50Hz_P422.yuv",
         "file_format": "YUV422RFC4175PG2BE10",
         "format": "YUV_422_10bit",
         "width": 720,
         "height": 576,
+        "fps": "50",
     },
     Crosswalk_1080p={
         "filename": "Netflix_Crosswalk_1920x1080_interlace_10bit_60Hz_P422.yuv",
         "file_format": "YUV422RFC4175PG2BE10",
         "format": "YUV_422_10bit",
         "width": 1920,
         "height": 1080,
+        "fps": "60",
     },
     ParkJoy_1080p={
         "filename": "ParkJoy_1920x1080_interlace_10bit_50Hz_P422.yuv",
         "file_format": "YUV422RFC4175PG2BE10",
         "format": "YUV_422_10bit",
         "width": 1920,
         "height": 1080,
+        "fps": "50",
     },
 )
 

tests/validation/mtl_engine/media_files.py

@@ -0,0 +1,28 @@
+import logging
+
+from mfd_connect.exceptions import ConnectionCalledProcessError
+
+
+class Ramdisk:
+    def __init__(self, host, mount_point, size_gib):
+        self._host = host
+        self._mount_point = mount_point
+        self._size_gib = size_gib
+
+    def mount(self):
+        cmd = f"mkdir -p {self._mount_point} && mount -t ramfs -o size={self._size_gib}G ramfs {self._mount_point}"
+        try:
+            self._host.connection.execute_command(cmd)
+        except ConnectionCalledProcessError as e:
+            logging.log(
+                level=logging.ERROR, msg=f"Failed to execute command {cmd}: {e}"
+            )
+
+    def unmount(self):
+        cmd = f"umount {self._mount_point} && rmdir {self._mount_point}"
+        try:
+            self._host.connection.execute_command(cmd)
+        except ConnectionCalledProcessError as e:
+            logging.log(
+                level=logging.ERROR, msg=f"Failed to execute command {cmd}: {e}"
+            )

tests/validation/mtl_engine/ramdisk.py

@@ -4,41 +4,62 @@
 
 import mtl_engine.RxTxApp as rxtxapp
 import pytest
+from mtl_engine.execute import LOG_FOLDER
 from mtl_engine.media_files import audio_files
 
 
+@pytest.mark.parametrize(
+    "media_file",
+    [
+        audio_files["PCM8"],
+        audio_files["PCM16"],
+        audio_files["PCM24"],
+    ],
+    indirect=["media_file"],
+    ids=[
+        "PCM8",
+        "PCM16",
+        "PCM24",
+    ],
+)
 @pytest.mark.parametrize("rss_mode", ["l3_l4", "l3", "none"])
-@pytest.mark.parametrize("audio_format", ["PCM8", "PCM16", "PCM24"])
 def test_rss_mode_audio(
     hosts,
     build,
     media,
     nic_port_list,
     test_time,
-    audio_format,
     rss_mode,
     test_config,
     prepare_ramdisk,
+    media_file,
 ):
-    audio_file = audio_files[audio_format]
+    media_file_info, media_file_path = media_file
     host = list(hosts.values())[0]
 
     # Get capture configuration from test_config.yaml
     # This controls whether tcpdump capture is enabled, where to store the pcap, etc.
     capture_cfg = dict(test_config.get("capture_cfg", {}))
-    capture_cfg["test_name"] = f"test_rss_mode_audio_{audio_format}_{rss_mode}"
+    capture_cfg["test_name"] = (
+        f"test_rss_mode_audio_{media_file_info['format']}_{rss_mode}"
+    )
+
+    # Ensure the output directory exists.
+    log_dir = os.path.join(os.getcwd(), LOG_FOLDER, "latest")
+    os.makedirs(log_dir, exist_ok=True)
+    out_file_url = os.path.join(log_dir, "out.wav")
 
     config = rxtxapp.create_empty_config()
     config = rxtxapp.add_st30p_sessions(
         config=config,
         nic_port_list=host.vfs,
         test_mode="unicast",
-        audio_format=audio_format,
+        audio_format=media_file_info["format"],
         audio_channel=["U02"],
         audio_sampling="48kHz",
         audio_ptime="1",
-        filename=os.path.join(media, audio_file["filename"]),
-        out_url=os.path.join(media, audio_file["filename"]),
+        filename=media_file_path,
+        out_url=out_file_url,
     )
     config = rxtxapp.change_rss_mode(content=config, rss_mode=rss_mode)