Merge branch 'main' into testCustomCliDownload

Author: OhadRevah

.pre-commit-config.yaml

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

tests/global_config_arm64.py

@@ -57,16 +57,16 @@
 latest_rhel_os_dict = get_latest_os_dict_list(os_list=[rhel_os_matrix])[0]
 
 # Modify instance_type_rhel_os_matrix for arm64
-instance_type_rhel_os_matrix = generate_linux_instance_type_os_matrix(os_name="rhel", preferences=[RHEL10_PREFERENCE])
+instance_type_rhel_os_matrix = generate_linux_instance_type_os_matrix(
+    os_name="rhel", preferences=[RHEL10_PREFERENCE], arch_suffix=ARM_64
+)
 instance_type_centos_os_matrix = generate_linux_instance_type_os_matrix(
     os_name="centos.stream", preferences=[CENTOS_STREAM10_PREFERENCE]
 )
 instance_type_fedora_os_matrix = generate_linux_instance_type_os_matrix(
-    os_name=OS_FLAVOR_FEDORA, preferences=[OS_FLAVOR_FEDORA]
+    os_name=OS_FLAVOR_FEDORA, preferences=[OS_FLAVOR_FEDORA], arch_suffix=ARM_64
 )
-for os_matrix_dict in instance_type_rhel_os_matrix + instance_type_centos_os_matrix + instance_type_fedora_os_matrix:
-    for os_params in os_matrix_dict.values():
-        os_params[PREFERENCE_STR] += f".{ARM_64}"
+
 
 for _dir in dir():
     if not config:  # noqa: F821

tests/global_config_s390x.py

@@ -25,7 +25,7 @@
 centos_os_matrix = generate_os_matrix_dict(os_name="centos", supported_operating_systems=["centos-stream-9"])
 
 instance_type_rhel_os_matrix = generate_linux_instance_type_os_matrix(
-    os_name="rhel", preferences=[utilities.constants.RHEL9_PREFERENCE]
+    os_name="rhel", preferences=[utilities.constants.RHEL9_PREFERENCE], arch_suffix=S390X
 )
 
 latest_rhel_os_dict, latest_fedora_os_dict, latest_centos_os_dict = get_latest_os_dict_list(

tests/install_upgrade_operators/console_cli_download/conftest.py

@@ -19,17 +19,6 @@
 LOGGER = logging.getLogger(__name__)
 
 
-@pytest.fixture(scope="class")
-def original_virtctl_console_cli_downloads_spec_links_scope_class(admin_client):
-    """
-    Get console cli downloads spec links
-
-    Returns:
-        ConsoleCLIDownload instance.spec.links
-    """
-    return get_console_spec_links(admin_client=admin_client, name=VIRTCTL_CLI_DOWNLOADS)
-
-
 @pytest.fixture()
 def all_virtctl_urls_scope_function(admin_client):
     return get_all_console_links(
@@ -38,9 +27,9 @@ def all_virtctl_urls_scope_function(admin_client):
 
 
 @pytest.fixture(scope="class")
-def all_virtctl_urls_scope_class(original_virtctl_console_cli_downloads_spec_links_scope_class):
+def all_virtctl_urls_scope_class(admin_client):
     return get_all_console_links(
-        console_cli_downloads_spec_links=original_virtctl_console_cli_downloads_spec_links_scope_class
+        console_cli_downloads_spec_links=get_console_spec_links(admin_client=admin_client, name=VIRTCTL_CLI_DOWNLOADS)
     )
 
 
@@ -106,5 +95,5 @@ def updated_cluster_ingress_downloads_spec_links(request, admin_client, hco_name
         yield
     validate_custom_cli_downloads_urls_updated(
         admin_client=admin_client,
-        original_virtctl_console_cli_downloads_spec_links=all_virtctl_urls_scope_class,
+        original_links=all_virtctl_urls_scope_class,
     )

tests/install_upgrade_operators/console_cli_download/utils.py

@@ -13,7 +13,7 @@
 def validate_custom_cli_downloads_urls_updated(
     admin_client: DynamicClient,
     new_hostname: str | None = None,
-    original_virtctl_console_cli_downloads_spec_links: list[str] | None = None,
+    original_links: list[str] | None = None,
 ) -> None:
     """
     Validates that console CLI download URLs have been properly updated.
@@ -27,7 +27,7 @@ def validate_custom_cli_downloads_urls_updated(
         new_hostname (str, optional): New hostname that should be present in all URLs.
             If provided, validates that all URLs contain this hostname.
             Mutually exclusive with original_virtctl_console_cli_downloads_spec_links.
-        original_virtctl_console_cli_downloads_spec_links (list[str], optional):
+        original_links (list[str], optional):
             Original list of CLI download URLs. If provided, validates that current
             URLs match these original URLs.
             Mutually exclusive with new_hostname.
@@ -40,7 +40,7 @@ def validate_custom_cli_downloads_urls_updated(
         ValueError: If both new_hostname and original_virtctl_console_cli_downloads_spec_links
             are provided, or if neither is provided.
     """
-    if (new_hostname is None) == (original_virtctl_console_cli_downloads_spec_links is None):
+    if (new_hostname is None) == (original_links is None):
         raise ValueError(
             "Exactly one of 'new_hostname' or 'original_virtctl_console_cli_downloads_spec_links' "
             "must be provided, not both or neither."
@@ -58,18 +58,18 @@ def validate_custom_cli_downloads_urls_updated(
     try:
         for sample in samples:
             current_cli_spec_links = [url.href for url in sample]
-            if original_virtctl_console_cli_downloads_spec_links:
-                if sorted(current_cli_spec_links) == sorted(original_virtctl_console_cli_downloads_spec_links):
+            if original_links:
+                if sorted(current_cli_spec_links) == sorted(original_links):
                     return
             elif new_hostname:
                 urls_not_updated_with_new_hostname = [url for url in current_cli_spec_links if new_hostname not in url]
                 if not urls_not_updated_with_new_hostname:
                     return
     except TimeoutExpiredError:
-        if original_virtctl_console_cli_downloads_spec_links:
+        if original_links:
             LOGGER.error(
                 f"Failed to update cluster ingress downloads spec links to the original links: "
-                f"original_cli_spec_links: {original_virtctl_console_cli_downloads_spec_links}, "
+                f"original_cli_spec_links: {original_links}, "
                 f"current_cli_spec_links: {current_cli_spec_links}"
             )
         else:

tests/network/conftest.py

@@ -224,6 +224,7 @@ def network_sanity(
     network_overhead,
     sriov_workers,
     ipv4_supported_cluster,
+    ipv6_supported_cluster,
     conformance_tests,
 ):
     """
@@ -310,13 +311,13 @@ def _verify_sriov():
                     f"has {len(sriov_workers)} SRIOV-capable worker nodes"
                 )
 
-    def _verify_ipv4():
-        if any(test.get_closest_marker("ipv4") for test in collected_tests):
-            LOGGER.info("Verifying if the cluster supports running IPV4 tests...")
-            if not ipv4_supported_cluster:
-                failure_msgs.append("IPv4 is not supported in this cluster")
+    def _verify_ip_family(family, is_supported_in_cluster):
+        if any(test.get_closest_marker(family) for test in collected_tests):
+            LOGGER.info(f"Verifying if the cluster supports running {family} tests...")
+            if not is_supported_in_cluster:
+                failure_msgs.append(f"{family} is not supported in this cluster")
             else:
-                LOGGER.info("Validated network lane is running against an IPV4 supported cluster")
+                LOGGER.info(f"Validated network lane is running against an {family} supported cluster")
 
     def _verify_bgp_env_vars():
         """Verify if the cluster supports running BGP tests.
@@ -343,7 +344,8 @@ def _verify_bgp_env_vars():
     _verify_service_mesh()
     _verify_jumbo_frame()
     _verify_sriov()
-    _verify_ipv4()
+    _verify_ip_family(family="ipv4", is_supported_in_cluster=ipv4_supported_cluster)
+    _verify_ip_family(family="ipv6", is_supported_in_cluster=ipv6_supported_cluster)
     _verify_bgp_env_vars()
 
     if failure_msgs:

tests/storage/fs_overhead/test_fs_overhead.py

@@ -93,7 +93,11 @@ def test_import_vm_with_specify_fs_overhead(updated_fs_overhead_20_with_hco, vm_
             pvc=PersistentVolumeClaim(name=vm_metadata["name"], namespace=vm_metadata["namespace"])
         ),
         requested_size=bitmath.GiB(
-            int(vm_for_fs_overhead_test.data_volume_template["spec"]["storage"]["resources"]["requests"]["storage"][0])
+            int(
+                bitmath.parse_string_unsafe(
+                    vm_for_fs_overhead_test.data_volume_template["spec"]["storage"]["resources"]["requests"]["storage"]
+                ).value
+            )
         ),
     )
 
@@ -105,5 +109,5 @@ def test_upload_dv_with_specify_fs_overhead(
 ):
     assert_fs_overhead_added(
         actual_size=get_pvc_size_gib(pvc=uploaded_cirros_dv.pvc),
-        requested_size=bitmath.GiB(int(Images.Cirros.DEFAULT_DV_SIZE[0])),
+        requested_size=bitmath.GiB(int(bitmath.parse_string_unsafe(Images.Cirros.DEFAULT_DV_SIZE).value)),
     )

tests/virt/node/migration_and_maintenance/test_vm_disk_load_with_migration.py

@@ -37,11 +37,12 @@ def running_fio_in_vm(vm_with_fio):
     # Random write/read -  create a 1G file, and perform 4KB reads and writes using a 75%/25%
     LOGGER.info("Running fio in VM")
     fio_cmd = shlex.split(
-        "sudo nohup /usr/bin/fio --loops=400 --runtime=600 --randrepeat=1 --ioengine=libaio --direct=1 "
+        "sudo nohup /usr/bin/fio --time_based --runtime=600 --randrepeat=1 --ioengine=libaio --direct=1 "
         "--gtod_reduce=1 --name=test --filename=/home/fedora/random_read_write.fio --bs=4k --iodepth=64 "
         "--size=1G --readwrite=randrw --rwmixread=75 --numjobs=8 >& /dev/null &"
     )
     run_ssh_commands(host=vm_with_fio.ssh_exec, commands=fio_cmd)
+    get_disk_usage(ssh_exec=vm_with_fio.ssh_exec)
 
 
 def get_disk_usage(ssh_exec):

utilities/os_utils.py

@@ -241,14 +241,17 @@ def generate_os_matrix_dict(os_name: str, supported_operating_systems: list[str]
     return os_formatted_list
 
 
-def generate_linux_instance_type_os_matrix(os_name: str, preferences: list[str]) -> list[dict[str, dict[str, Any]]]:
+def generate_linux_instance_type_os_matrix(
+    os_name: str, preferences: list[str], arch_suffix: str | None = None
+) -> list[dict[str, dict[str, Any]]]:
     """
     Generate a list of dictionaries representing the instance type matrix for a Linux OS type.
     Each dictionary represents a specific instance type and its configuration.
 
     Args:
         os_name (str): The name of the OS.
         preferences (list[str]): A list of preferences for the instance types. Preference format is "<os>.<version>".
+        arch_suffix: Optional architecture suffix. Example: "s390x", "arm64" . Omit to keep original preference.
 
     Returns:
         list[dict[str, dict[str, Any]]]: A list of dictionaries representing the instance type matrix.
@@ -269,13 +272,14 @@ def _format_data_source_name(preference_name: str) -> str:
     instance_types: list[dict[str, dict[str, Any]]] = []
 
     for preference in preferences:
+        arch_preference = f"{preference}.{arch_suffix}" if arch_suffix else preference
         preference_config: dict[str, Any] = {
-            PREFERENCE_STR: preference,
+            PREFERENCE_STR: arch_preference,
             DATA_SOURCE_NAME: _format_data_source_name(preference_name=preference),
         }
 
         if preference == latest_os:
             preference_config[LATEST_RELEASE_STR] = True
 
-        instance_types.append({preference: preference_config})
+        instance_types.append({arch_preference: preference_config})
     return instance_types