Merge branch 'RedHatQE:main' into virt-operator-ready

Author: albarker-rh

.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]

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/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()

libs/vm/factory.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from kubernetes.dynamic import DynamicClient
+
 from libs.vm.spec import CPU, Devices, Domain, Memory, Metadata, Template, VMISpec, VMSpec
 from libs.vm.vm import BaseVirtualMachine, container_image, containerdisk_storage
 from utilities.constants import OS_FLAVOR_FEDORA, Images
@@ -8,6 +10,7 @@
 def fedora_vm(
     namespace: str,
     name: str,
+    client: DynamicClient,
     spec: VMSpec | None = None,
     vm_labels: dict[str, str] | None = None,
     vm_annotations: dict[str, str] | None = None,
@@ -21,6 +24,7 @@ def fedora_vm(
         vm_labels=vm_labels,
         vm_annotations=vm_annotations,
         os_distribution=OS_FLAVOR_FEDORA,
+        client=client,
     )
 
 

pyproject.toml

@@ -30,9 +30,9 @@ strict_concatenate = true
 
 
 [project]
-name = "openshift-virtualization-tests-4.20"
+name = "openshift-virtualization-tests-4.21"
 requires-python = "==3.12.*"
-version = "4.20"
+version = "4.21"
 description = "Tests for Openshift Virtualization"
 authors = [{ "name" = "openshift-virtualization-tests" }]
 dependencies = [

tests/conftest.py

@@ -912,6 +912,16 @@ def rhel9_data_source_scope_session(golden_images_namespace):
     )
 
 
+@pytest.fixture(scope="session")
+def rhel10_data_source_scope_session(golden_images_namespace):
+    return DataSource(
+        namespace=golden_images_namespace.name,
+        name="rhel10",
+        client=golden_images_namespace.client,
+        ensure_exists=True,
+    )
+
+
 """
 VM creation from template
 """
@@ -1140,11 +1150,6 @@ def skip_access_mode_rwo_scope_class(storage_class_matrix__class__):
     _skip_access_mode_rwo(storage_class_matrix=storage_class_matrix__class__)
 
 
-@pytest.fixture(scope="module")
-def skip_access_mode_rwo_scope_module(storage_class_matrix__module__):
-    _skip_access_mode_rwo(storage_class_matrix=storage_class_matrix__module__)
-
-
 @pytest.fixture(scope="session")
 def nodes_cpu_vendor(schedulable_nodes):
     if schedulable_nodes[0].labels.get(f"cpu-vendor.node.kubevirt.io/{AMD}"):

tests/infrastructure/conftest.py

@@ -0,0 +1,26 @@
+import bitmath
+import pytest
+
+
+@pytest.fixture(scope="session")
+def hugepages_gib_values(workers):
+    """Return the list of hugepage sizes (in GiB) across all worker nodes."""
+    return [
+        int(bitmath.parse_string_unsafe(value).GiB)
+        for worker in workers
+        if (value := worker.instance.status.allocatable.get("hugepages-1Gi"))
+    ]
+
+
+@pytest.fixture(scope="session")
+def xfail_if_no_huge_pages(hugepages_gib_values):
+    """Mark tests as xfail if the cluster lacks 1Gi hugepages."""
+    if not hugepages_gib_values or max(hugepages_gib_values) < 1:
+        pytest.xfail("Requires at least 1Gi hugepages on some node")
+
+
+@pytest.fixture(scope="session")
+@pytest.mark.usefixtures("xfail_if_no_huge_pages")
+def hugepages_gib_max(hugepages_gib_values):
+    """Return the maximum 1Gi hugepage size, capped at 64Gi."""
+    return min(max(hugepages_gib_values), 64)

tests/infrastructure/golden_images/conftest.py

@@ -1,11 +1,14 @@
-import os
-import re
-from pathlib import Path
+import logging
 
 import pytest
+import requests
 from ocp_resources.resource import ResourceEditor
 from ocp_resources.storage_class import StorageClass
 
+from utilities.constants import TIMEOUT_30SEC
+
+LOGGER = logging.getLogger(__name__)
+
 
 @pytest.fixture()
 def updated_default_storage_class_scope_function(
@@ -29,14 +32,13 @@ def updated_default_storage_class_scope_function(
 
 
 @pytest.fixture(scope="module")
-def latest_fedora_release_version(downloaded_latest_libosinfo_db):
-    """
-    Extract the version from file name, if no files found raise KeyError
-    file example: /tmp/pytest-6axFnW3vzouCkjWokhvbDi/osinfodb0/osinfo-db-20221121/os/fedoraproject.org/fedora-42.xml
-    """
-    osinfo_file_folder_path = os.path.join(downloaded_latest_libosinfo_db, "os/fedoraproject.org/")
-    list_of_fedora_os_files = list(sorted(Path(osinfo_file_folder_path).glob("*fedora-[0-9][0-9]*.xml")))
-    if not list_of_fedora_os_files:
-        raise FileNotFoundError("No fedora files were found in osinfo db")
-    latest_fedora_os_file = list_of_fedora_os_files[-1]
-    return re.findall(r"\d+", latest_fedora_os_file.name)[0]
+def latest_fedora_release_version():
+    response = requests.get(url="https://fedoraproject.org/releases.json", verify=False, timeout=TIMEOUT_30SEC)
+    response.raise_for_status()
+    response_json = response.json()
+    versions = {int(item["version"]) for item in response_json if item.get("version", "").isdigit()}
+    if not versions:
+        raise ValueError(f"No Fedora versions found in release json: {response_json}")
+    latest_fedora_version = str(max(versions))
+    LOGGER.info(f"Latest Fedora release: {latest_fedora_version}")
+    return latest_fedora_version

tests/infrastructure/golden_images/update_boot_source/test_ssp_common_templates_boot_sources.py

@@ -11,7 +11,7 @@
     assert_missing_golden_image_pvc,
     assert_os_version_mismatch_in_vm,
 )
-from utilities.constants import RHEL9_STR, TIMEOUT_5MIN, TIMEOUT_5SEC, Images
+from utilities.constants import OS_FLAVOR_FEDORA, RHEL9_STR, TIMEOUT_5MIN, TIMEOUT_5SEC, Images
 from utilities.infra import (
     cleanup_artifactory_secret_and_config_map,
     get_artifactory_config_map,
@@ -137,7 +137,7 @@ def test_vm_from_auto_update_boot_source(
     latest_fedora_release_version,
 ):
     LOGGER.info(f"Verify {auto_update_boot_source_vm.name} OS version and virtctl info")
-    if "fedora" in boot_source_os_from_data_source_dict and latest_fedora_release_version:
+    if OS_FLAVOR_FEDORA in boot_source_os_from_data_source_dict and latest_fedora_release_version:
         boot_source_os_from_data_source_dict = f"fedora{latest_fedora_release_version}"
     assert_os_version_mismatch_in_vm(
         vm=auto_update_boot_source_vm,

tests/infrastructure/instance_types/supported_os/conftest.py

@@ -1,7 +1,24 @@
 import pytest
+from ocp_resources.datavolume import DataVolume
+from ocp_resources.virtual_machine_cluster_instancetype import VirtualMachineClusterInstancetype
+from ocp_resources.virtual_machine_cluster_preference import VirtualMachineClusterPreference
+from pytest_testconfig import config as py_config
 
 from tests.infrastructure.instance_types.supported_os.utils import golden_image_vm_with_instance_type
-from utilities.constants import DATA_SOURCE_NAME, RHEL8_PREFERENCE
+from utilities.constants import (
+    CONTAINER_DISK_IMAGE_PATH_STR,
+    DATA_SOURCE_NAME,
+    DATA_SOURCE_STR,
+    RHEL8_PREFERENCE,
+    Images,
+)
+from utilities.infra import (
+    cleanup_artifactory_secret_and_config_map,
+    get_artifactory_config_map,
+    get_artifactory_secret,
+)
+from utilities.storage import get_test_artifact_server_url
+from utilities.virt import VirtualMachineForTests
 
 
 @pytest.fixture(scope="class")
@@ -68,3 +85,52 @@ def golden_image_fedora_vm_with_instance_type(
         storage_class_name=[*storage_class_matrix__module__][0],
         data_source_name=instance_type_fedora_os_matrix__module__[os_name][DATA_SOURCE_NAME],
     )
+
+
+@pytest.fixture(scope="module")
+def windows_data_volume_template(
+    namespace,
+    windows_os_matrix__module__,
+):
+    os_matrix_key = [*windows_os_matrix__module__][0]
+    os_params = windows_os_matrix__module__[os_matrix_key]
+    secret = get_artifactory_secret(namespace=namespace.name)
+    cert = get_artifactory_config_map(namespace=namespace.name)
+    win_dv = DataVolume(
+        name=f"{os_matrix_key}-dv",
+        namespace=namespace.name,
+        api_name="storage",
+        source="registry",
+        size=Images.Windows.CONTAINER_DISK_DV_SIZE,
+        storage_class=py_config["default_storage_class"],
+        url=f"{get_test_artifact_server_url(schema='registry')}/{os_params[CONTAINER_DISK_IMAGE_PATH_STR]}",
+        secret=secret,
+        cert_configmap=cert.name,
+    )
+    win_dv.to_dict()
+    yield win_dv
+    cleanup_artifactory_secret_and_config_map(artifactory_secret=secret, artifactory_config_map=cert)
+
+
+@pytest.fixture(scope="class")
+def golden_image_windows_vm(
+    unprivileged_client,
+    namespace,
+    modern_cpu_for_migration,
+    windows_data_volume_template,
+    windows_os_matrix__module__,
+):
+    os_name = [*windows_os_matrix__module__][0]
+    return VirtualMachineForTests(
+        client=unprivileged_client,
+        name=f"{os_name}-vm-with-instance-type-2",
+        namespace=namespace.name,
+        vm_instance_type=VirtualMachineClusterInstancetype(name="u1.large"),
+        vm_preference=VirtualMachineClusterPreference(
+            name=windows_os_matrix__module__[os_name][DATA_SOURCE_STR].replace("win", "windows.")
+        ),
+        data_volume_template=windows_data_volume_template.res,
+        os_flavor="win-container-disk",
+        disk_type=None,
+        cpu_model=modern_cpu_for_migration,
+    )