Merge branch 'main' into removeCpuMetrics

Author: OhadRevah

.flake8

@@ -74,6 +74,7 @@ fcn_exclude_functions =
     skip,
     QueueListener,
     requests,
+    multiprocessing,
 
 nit_exclude_imports =
     os_params,

.github/labeler.yml

@@ -33,7 +33,7 @@ sig-scale:
 sig-storage:
   - changed-files:
     - any-glob-to-any-file:
-      - 'tests/{data_protection,storage}/**'
+      - 'tests/{data_protection,storage,cross_cluster_live_migration}/**'
       - 'utilities/storage.py'
 
 sig-virt:

.github/workflows/request-coderabbit-test-instructions.yml

@@ -37,6 +37,9 @@ jobs:
             <details>
               <summary>Test execution plan request details</summary>
 
+              CRITICAL: You MUST respond with a review comment on the Files Changed tab, NOT as a regular PR comment.
+              If it cannot be on the 1st line of the 1st file, add it to any other changed file.
+
               As an expert software testing engineer, analyze all modified files in this PR and create a targeted test execution plan.
               You will create a change request comment on the 1st line of the 1st file in the pr with the test execution plan.
               If you fail to run or post a comment, retry.

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
         stages: [pre-commit]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.2
+    rev: v0.14.3
     hooks:
       - id: ruff
         stages: [pre-commit]

Dockerfile

@@ -31,7 +31,7 @@ ARG TIMEOUT_SAMPLER_COMMIT=''
 
 ENV LANG=C.UTF-8
 ENV CNV_TESTS_CONTAINER=Yes
-ENV UV_PYTHON=python3.12
+ENV UV_PYTHON=python3.14
 ENV UV_NO_SYNC=1
 
 WORKDIR ${TEST_DIR}

containers/fedora/user-data

@@ -22,7 +22,13 @@ write_files:
         WantedBy=cloud-init.service
 runcmd:
   - systemctl daemon-reload
-  - dnf install -y tcpdump qemu-guest-agent iperf3 dmidecode nginx lldpad kernel-modules nmap dhcp-server dhcp-relay sshpass podman ethtool libibverbs dpdk stress-ng iotop fio
+  - |
+    PACKAGES="tcpdump qemu-guest-agent iperf3 nginx lldpad kernel-modules nmap dhcp-server dhcp-relay sshpass podman ethtool libibverbs stress-ng iotop fio"
+    ARCH=$(uname -m)
+    if [ "${ARCH}" != "s390x" ]; then
+      PACKAGES="$PACKAGES dmidecode dpdk"
+    fi
+    dnf install -y ${PACKAGES}
   - dnf autoremove
   - dnf clean all
   - rpm -q kernel-core | sort | head -1 | xargs rpm -e

docs/GETTING_STARTED.md

@@ -43,7 +43,7 @@ Please refer to [ARCHITECTURE_SUPPORT.md](ARCHITECTURE_SUPPORT.md) for more deta
 
 
 ## Python and dependencies
-python >=3.12
+python >=3.14
 
 The Complete list of environment dependencies can be found in [Dockerfile](../Dockerfile)
 
@@ -55,3 +55,13 @@ The Complete list of environment dependencies can be found in [Dockerfile](../Do
 ## oc
 
 `oc` client should be downloaded from `consoleCliDownloads` resource of the cluster under test.
+
+## bws - Bitwarden CLI
+
+Bitwarden CLI should be installed on the machine running the tests. See [Secrets Manager CLI](https://bitwarden.com/help/secrets-manager-cli/#download-and-install).
+Bitwarden token should be set in the `ACCESS_TOKEN` environment variable.
+Ensure the `unzip` package is installed on your system, as it is required by the bws installation script.
+
+```bash
+curl -fsSL https://bws.bitwarden.com/install | sh
+```

libs/infra/images.py

@@ -72,6 +72,7 @@ class Windows:
     ISO_WIN11_DIR: str = f"{ISO_BASE_DIR}/win11"
     ISO_WIN2022_DIR: str = f"{ISO_BASE_DIR}/win2022"
     ISO_WIN2025_DIR: str = f"{ISO_BASE_DIR}/win2025"
+    CONTAINER_DISK_DV_SIZE = "40Gi"
     DEFAULT_DV_SIZE: str = "70Gi"
     DEFAULT_MEMORY_SIZE: str = "8Gi"
     DEFAULT_MEMORY_SIZE_WSL: str = "12Gi"

libs/net/OWNERS

@@ -0,0 +1,9 @@
+root-approvers: False
+approvers:
+  - EdDev
+reviewers:
+  - yossisegev
+  - Anatw
+  - EdDev
+  - servolkov
+  - azhivovk

libs/net/traffic_generator.py

@@ -4,7 +4,7 @@
 
 from ocp_resources.pod import Pod
 from ocp_utilities.exceptions import CommandExecFailed
-from timeout_sampler import TimeoutExpiredError, TimeoutSampler, retry
+from timeout_sampler import retry
 
 from libs.vm.vm import BaseVirtualMachine
 
@@ -15,7 +15,7 @@
 LOGGER = logging.getLogger(__name__)
 
 
-class BaseClient(ABC):
+class BaseTcpClient(ABC):
     """Base abstract class for network traffic generator client."""
 
     def __init__(self, server_ip: str, server_port: int):
@@ -24,7 +24,7 @@ def __init__(self, server_ip: str, server_port: int):
         self._cmd = f"{_IPERF_BIN} --client {self._server_ip} --time 0 --port {self.server_port} --connect-timeout 300"
 
     @abstractmethod
-    def __enter__(self) -> "BaseClient":
+    def __enter__(self) -> "BaseTcpClient":
         pass
 
     @abstractmethod
@@ -36,7 +36,7 @@ def is_running(self) -> bool:
         pass
 
 
-class Server:
+class TcpServer:
     """
     Represents a server running on a virtual machine for testing network performance.
     Implemented with iperf3
@@ -55,11 +55,13 @@ def __init__(
         self._port = port
         self._cmd = f"{_IPERF_BIN} --server --port {self._port} --one-off"
 
-    def __enter__(self) -> "Server":
+    def __enter__(self) -> "TcpServer":
         self._vm.console(
             commands=[f"{self._cmd} &"],
             timeout=_DEFAULT_CMD_TIMEOUT_SEC,
         )
+        self._ensure_is_running()
+
         return self
 
     def __exit__(self, exc_type: BaseException, exc_value: BaseException, traceback: object) -> None:
@@ -72,10 +74,13 @@ def vm(self) -> BaseVirtualMachine:
     def is_running(self) -> bool:
         return _is_process_running(vm=self._vm, cmd=self._cmd)
 
+    @retry(wait_timeout=30, sleep=2, exceptions_dict={})
+    def _ensure_is_running(self) -> bool:
+        return self.is_running()
+
 
-class Client(BaseClient):
-    """
-    Represents a client that connects to a server to test network performance.
+class VMTcpClient(BaseTcpClient):
+    """Represents a TCP client that connects to a server to test network performance.
     Implemented with iperf3
 
     Args:
@@ -93,11 +98,13 @@ def __init__(
         super().__init__(server_ip=server_ip, server_port=server_port)
         self._vm = vm
 
-    def __enter__(self) -> "Client":
+    def __enter__(self) -> "VMTcpClient":
         self._vm.console(
             commands=[f"{self._cmd} &"],
             timeout=_DEFAULT_CMD_TIMEOUT_SEC,
         )
+        self._ensure_is_running()
+
         return self
 
     def __exit__(self, exc_type: BaseException, exc_value: BaseException, traceback: object) -> None:
@@ -110,6 +117,10 @@ def vm(self) -> BaseVirtualMachine:
     def is_running(self) -> bool:
         return _is_process_running(vm=self._vm, cmd=self._cmd)
 
+    @retry(wait_timeout=30, sleep=2, exceptions_dict={})
+    def _ensure_is_running(self) -> bool:
+        return self.is_running()
+
 
 def _stop_process(vm: BaseVirtualMachine, cmd: str) -> None:
     try:
@@ -118,25 +129,18 @@ def _stop_process(vm: BaseVirtualMachine, cmd: str) -> None:
         LOGGER.warning(str(e))
 
 
-def _is_process_running(  # type: ignore[return]
-    vm: BaseVirtualMachine, cmd: str
-) -> bool:
+def _is_process_running(vm: BaseVirtualMachine, cmd: str) -> bool:
     try:
-        for sample in TimeoutSampler(
-            wait_timeout=60,
-            sleep=5,
-            func=vm.console,
+        vm.console(
             commands=[f"pgrep -fx '{cmd}'"],
             timeout=_DEFAULT_CMD_TIMEOUT_SEC,
-        ):
-            if sample:
-                return True
-    except TimeoutExpiredError as e:
-        LOGGER.warning(f"Process is not running on VM {vm.name}. Error: {str(e.last_exp)}")
+        )
+        return True
+    except CommandExecFailed:
         return False
 
 
-class PodClient(BaseClient):
+class PodTcpClient(BaseTcpClient):
     """Represents a TCP client that connects to a server to test network performance.
 
     Expects pod to have iperf3 container.
@@ -155,7 +159,7 @@ def __init__(self, pod: Pod, server_ip: str, server_port: int, bind_interface: s
         self._container = _IPERF_BIN
         self._cmd += f" --bind {bind_interface}" if bind_interface else ""
 
-    def __enter__(self) -> "PodClient":
+    def __enter__(self) -> "PodTcpClient":
         # run the command in the background using nohup to ensure it keeps running after the exec session ends
         self._pod.execute(
             command=["sh", "-c", f"nohup {self._cmd} >/tmp/{_IPERF_BIN}.log 2>&1 &"], container=self._container
@@ -178,5 +182,5 @@ def _ensure_is_running(self) -> bool:
         return self.is_running()
 
 
-def is_tcp_connection(server: Server, client: Client | PodClient) -> bool:
+def is_tcp_connection(server: TcpServer, client: BaseTcpClient) -> bool:
     return server.is_running() and client.is_running()