Changes to support remote host test execution

Signed-off-by: Wilczynski, Andrzej <andrzej.wilczynski@intel.com>

Author: awilczyns

tests/validation/mtl_engine/application_base.py

@@ -6,7 +6,8 @@
 import time
 from abc import ABC, abstractmethod
 
-from .config.app_mappings import DEFAULT_PAYLOAD_TYPE_CONFIG, DEFAULT_PORT_CONFIG
+from .config.app_mappings import (DEFAULT_PAYLOAD_TYPE_CONFIG,
+                                  DEFAULT_PORT_CONFIG)
 from .config.universal_params import UNIVERSAL_PARAMS
 from .execute import run
 
@@ -163,6 +164,19 @@ def get_common_video_params(self) -> dict:
             ),
         }
 
+    def prepare_execution(self, build: str, host=None, **kwargs):
+        """Hook method called before execution to perform framework-specific setup.
+
+        Subclasses can override this to write config files, set up environment, etc.
+        Default implementation does nothing.
+
+        Args:
+            build: Build directory path
+            host: Host connection object
+            **kwargs: Additional arguments passed from execute_test
+        """
+        pass
+
     def execute_test(
         self,
         build: str,
@@ -198,6 +212,14 @@ def execute_test(
             raise RuntimeError("create_command() must be called before execute_test()")
         framework_name = self.get_framework_name()
 
+        # Call framework-specific preparation hook
+        if not is_dual:
+            self.prepare_execution(build=build, host=host)
+        else:
+            self.prepare_execution(build=build, host=tx_host)
+            if rx_app:
+                rx_app.prepare_execution(build=build, host=rx_host)
+
         # Single-host execution
         if not is_dual:
             cmd = self.add_timeout(self.command, test_time)

tests/validation/mtl_engine/rxtxapp.py

@@ -3,14 +3,10 @@
 
 import json
 import logging
-import os
 
 from .application_base import Application
 from .config.app_mappings import APP_NAME_MAP, DEFAULT_NETWORK_CONFIG
-from .config.param_mappings import (
-    RXTXAPP_CMDLINE_PARAM_MAP,
-    RXTXAPP_CONFIG_PARAM_MAP,
-)
+from .config.param_mappings import RXTXAPP_CMDLINE_PARAM_MAP
 from .config.universal_params import UNIVERSAL_PARAMS
 
 # Create IP dictionaries for backward compatibility using DEFAULT_NETWORK_CONFIG
@@ -37,26 +33,17 @@
 
     from . import rxtxapp_config as legacy_cfg
     from .execute import log_fail
-
     # Import legacy helpers so we can emit a backward-compatible JSON config
-    from .RxTxApp import (
-        add_interfaces,
-        check_rx_output,
-        check_tx_output,
-        create_empty_config,
-    )
+    from .RxTxApp import (add_interfaces, check_rx_output, check_tx_output,
+                          create_empty_config)
 except ImportError:
     # Fallback for direct execution (when running this module standalone)
     import copy
 
     import rxtxapp_config as legacy_cfg
     from execute import log_fail
-    from RxTxApp import (
-        add_interfaces,
-        check_rx_output,
-        check_tx_output,
-        create_empty_config,
-    )
+    from RxTxApp import (add_interfaces, check_rx_output, check_tx_output,
+                         create_empty_config)
 
 logger = logging.getLogger(__name__)
 
@@ -75,17 +62,7 @@ def create_command(self, **kwargs):  # type: ignore[override]
         cmd, cfg = self._create_rxtxapp_command_and_config()
         self.command = cmd
         self.config = cfg
-        # Write config immediately if path known
-        config_path = (
-            self.config_file_path
-            or self.universal_params.get("config_file")
-            or "config.json"
-        )
-        try:
-            with open(config_path, "w") as f:
-                json.dump(cfg, f, indent=2)
-        except Exception as e:
-            logger.warning(f"Failed to write RxTxApp config file {config_path}: {e}")
+        # Config will be written to remote host during execute_test
         return self.command, self.config
 
     def _create_rxtxapp_command_and_config(self) -> tuple:
@@ -96,13 +73,12 @@ def _create_rxtxapp_command_and_config(self) -> tuple:
         Returns:
             Tuple of (command_string, config_dict)
         """
-        # Use config file path from constructor or default (absolute path)
+        # Use config file path from constructor or default (relative to build dir on remote host)
         if self.config_file_path:
             config_file_path = self.config_file_path
         else:
-            config_file_path = os.path.abspath(
-                DEFAULT_NETWORK_CONFIG["default_config_file"]
-            )
+            # Use tests/config.json relative to build directory on remote host
+            config_file_path = "tests/config.json"
 
         # Build command line with all command-line parameters
         executable_path = self.get_executable_path()
@@ -491,6 +467,62 @@ def _populate_session(is_tx: bool):
 
         return config
 
+    def prepare_execution(self, build: str, host=None, **kwargs):
+        """Write RxTxApp JSON config file to remote host before execution."""
+        if not host:
+            raise ValueError("host required for RxTxApp config writing")
+
+        if not self.config:
+            raise RuntimeError(
+                "create_command() must be called before prepare_execution()"
+            )
+
+        # Write config file to remote host
+        remote_conn = host.connection
+        # Extract config file path from command (it's relative)
+        import re
+
+        match = re.search(r"--config_file\s+(\S+)", self.command)
+        if match:
+            config_file_relative = match.group(1)
+            # Make it absolute on remote host by joining with build directory
+            config_file_path = f"{build}/{config_file_relative}"
+        else:
+            config_file_path = f"{build}/tests/config.json"
+
+        # Write config to remote host
+        config_json = json.dumps(self.config, indent=4)
+
+        # Use heredoc to write file properly on remote host (avoids quote escaping issues)
+        try:
+            from mfd_connect import SSHConnection
+
+            if isinstance(remote_conn, SSHConnection):
+                # Write using heredoc to avoid quote escaping issues with echo
+                cmd = f"""cat > {config_file_path} << 'EOFCONFIG'
+{config_json}
+EOFCONFIG"""
+                remote_conn.execute_command(cmd)
+                logger.info(f"Wrote RxTxApp config to remote host: {config_file_path}")
+            else:
+                # For local or other connection types, use write_text
+                f = remote_conn.path(config_file_path)
+                f.write_text(config_json, encoding="utf-8")
+                logger.info(f"Wrote RxTxApp config to host: {config_file_path}")
+        except (ImportError, Exception) as e:
+            logger.warning(
+                f"Could not use SSH heredoc method ({e}), falling back to write_text"
+            )
+            # Fallback to write_text if SSH not available
+            f = remote_conn.path(config_file_path)
+            f.write_text(config_json, encoding="utf-8")
+            logger.info(f"Wrote RxTxApp config to host: {config_file_path}")
+
+        # Update command to use absolute path on remote host
+        self.command = self.command.replace(
+            f"--config_file {config_file_relative}", f"--config_file {config_file_path}"
+        )
+
     def validate_results(self) -> bool:  # type: ignore[override]
         """
         Validate execution results exactly like original RxTxApp.execute_test().
@@ -539,10 +571,8 @@ def _fail(msg: str):
 
                 # Import converter check functions if available
                 try:
-                    from .RxTxApp import (
-                        check_rx_converter_output,
-                        check_tx_converter_output,
-                    )
+                    from .RxTxApp import (check_rx_converter_output,
+                                          check_tx_converter_output)
 
                     passed = passed and check_tx_converter_output(
                         config=self.config,

tests/validation/tests/single/st20p/format/test_format_refactored.py

@@ -2,10 +2,11 @@
 # Copyright(c) 2024-2025 Intel Corporation
 
 import pytest
-from common.nicctl import InterfaceSetup
 from mtl_engine.media_files import yuv_files_422p10le, yuv_files_422rfc10
 from mtl_engine.rxtxapp import RxTxApp
 
+from common.nicctl import InterfaceSetup
+
 
 @pytest.mark.smoke
 @pytest.mark.nightly
@@ -201,6 +202,7 @@ def test_tx_rx_conversion_refactored(
     )
 
 
+@pytest.mark.nightly
 @pytest.mark.parametrize(
     "media_file",
     [yuv_files_422rfc10["test_8K"]],

tests/validation/tests/single/st20p/fps/test_fps_refactored.py

@@ -2,10 +2,11 @@
 # Copyright(c) 2024-2025 Intel Corporation
 
 import pytest
-from common.nicctl import InterfaceSetup
 from mtl_engine.media_files import yuv_files_422rfc10
 from mtl_engine.rxtxapp import RxTxApp
 
+from common.nicctl import InterfaceSetup
+
 
 @pytest.mark.nightly
 @pytest.mark.parametrize(
@@ -78,4 +79,6 @@ def test_fps_refactored(
     elif fps in ["p100", "p119", "p120"]:
         actual_test_time = max(test_time, 10)
 
-    app.execute_test(build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture)
+    app.execute_test(
+        build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture
+    )

tests/validation/tests/single/st20p/integrity/test_integrity_refactored.py

@@ -2,16 +2,18 @@
 # Copyright(c) 2024-2025 Intel Corporation
 
 import logging
+from pathlib import Path
 
 import pytest
-from common.nicctl import InterfaceSetup
 from mfd_common_libs.log_levels import TEST_PASS
 from mtl_engine.const import LOG_FOLDER
 from mtl_engine.execute import log_fail
-from mtl_engine.integrity import calculate_yuv_frame_size, check_st20p_integrity
+from mtl_engine.integrity import (calculate_yuv_frame_size,
+                                  check_st20p_integrity)
 from mtl_engine.media_files import yuv_files_422p10le, yuv_files_422rfc10
 from mtl_engine.rxtxapp import RxTxApp
-from pathlib import Path
+
+from common.nicctl import InterfaceSetup
 
 logger = logging.getLogger(__name__)
 
@@ -75,7 +77,9 @@ def test_integrity_refactored(
     )
 
     actual_test_time = max(test_time, 8)
-    app.execute_test(build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture)
+    app.execute_test(
+        build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture
+    )
 
     frame_size = calculate_yuv_frame_size(
         media_file_info["width"],

tests/validation/tests/single/st20p/interlace/test_interlace_refactored.py

@@ -2,10 +2,11 @@
 # Copyright(c) 2024-2025 Intel Corporation
 
 import pytest
-from common.nicctl import InterfaceSetup
 from mtl_engine.media_files import yuv_files_interlace
 from mtl_engine.rxtxapp import RxTxApp
 
+from common.nicctl import InterfaceSetup
+
 
 @pytest.mark.nightly
 @pytest.mark.parametrize(
@@ -54,4 +55,6 @@ def test_interlace_refactored(
 
     app.create_command(**config_params)
     actual_test_time = max(test_time, 10)
-    app.execute_test(build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture)
+    app.execute_test(
+        build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture
+    )

tests/validation/tests/single/st20p/pacing/test_pacing_refactored.py

@@ -2,10 +2,11 @@
 # Copyright(c) 2024-2025 Intel Corporation
 
 import pytest
-from common.nicctl import InterfaceSetup
 from mtl_engine.media_files import yuv_files_422rfc10
 from mtl_engine.rxtxapp import RxTxApp
 
+from common.nicctl import InterfaceSetup
+
 
 @pytest.mark.nightly
 @pytest.mark.parametrize("pacing", ["narrow", "wide", "linear"])
@@ -67,4 +68,6 @@ def test_pacing_refactored(
         actual_test_time = max(test_time, 8)
 
     app.create_command(**config_params)
-    app.execute_test(build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture)
+    app.execute_test(
+        build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture
+    )

tests/validation/tests/single/st20p/packing/test_packing_refactored.py

@@ -2,10 +2,11 @@
 # Copyright(c) 2024-2025 Intel Corporation
 
 import pytest
-from common.nicctl import InterfaceSetup
 from mtl_engine.media_files import yuv_files_422rfc10
 from mtl_engine.rxtxapp import RxTxApp
 
+from common.nicctl import InterfaceSetup
+
 
 @pytest.mark.nightly
 @pytest.mark.parametrize("packing", ["GPM_SL", "GPM"])
@@ -68,4 +69,6 @@ def test_packing_refactored(
         actual_test_time = max(test_time, 8)
 
     app.create_command(**config_params)
-    app.execute_test(build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture)
+    app.execute_test(
+        build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture
+    )

tests/validation/tests/single/st20p/resolutions/test_resolutions_refactored.py

@@ -2,10 +2,11 @@
 # Copyright(c) 2024-2025 Intel Corporation
 
 import pytest
-from common.nicctl import InterfaceSetup
 from mtl_engine.media_files import yuv_files_422rfc10
 from mtl_engine.rxtxapp import RxTxApp
 
+from common.nicctl import InterfaceSetup
+
 
 @pytest.mark.nightly
 @pytest.mark.parametrize(
@@ -71,4 +72,6 @@ def test_resolutions_refactored(
     else:
         actual_test_time = max(test_time, 8)
 
-    app.execute_test(build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture)
+    app.execute_test(
+        build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture
+    )

tests/validation/tests/single/st20p/test_mode/test_multicast_refactored.py

@@ -2,10 +2,11 @@
 # Copyright(c) 2024-2025 Intel Corporation
 
 import pytest
-from common.nicctl import InterfaceSetup
 from mtl_engine.media_files import yuv_files_422rfc10
 from mtl_engine.rxtxapp import RxTxApp
 
+from common.nicctl import InterfaceSetup
+
 
 @pytest.mark.nightly
 @pytest.mark.parametrize(
@@ -68,4 +69,6 @@ def test_multicast_refactored(
         actual_test_time = max(test_time, 8)
 
     app.create_command(**config_params)
-    app.execute_test(build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture)
+    app.execute_test(
+        build=build, test_time=actual_test_time, host=host, netsniff=pcap_capture
+    )