Merge branch 'main' into testCustomCliDownload

Author: OhadRevah

tests/install_upgrade_operators/console_cli_download/conftest.py

@@ -20,7 +20,7 @@
 
 
 @pytest.fixture()
-def virtctl_console_cli_downloads_spec_links(admin_client):
+def virtctl_console_cli_downloads_spec_links_scope_function(admin_client):
     """
     Get console cli downloads spec links
 
@@ -31,7 +31,7 @@ def virtctl_console_cli_downloads_spec_links(admin_client):
 
 
 @pytest.fixture(scope="class")
-def virtctl_console_cli_downloads_spec_links_scope_class(admin_client):
+def original_virtctl_console_cli_downloads_spec_links_scope_class(admin_client):
     """
     Get console cli downloads spec links
 
@@ -42,15 +42,19 @@ def virtctl_console_cli_downloads_spec_links_scope_class(admin_client):
 
 
 @pytest.fixture()
-def all_virtctl_urls_scope_function(virtctl_console_cli_downloads_spec_links):
+def all_virtctl_urls_scope_function(virtctl_console_cli_downloads_spec_links_scope_function):
     """This fixture returns URLs for the various OSs to download virtctl"""
-    return get_all_console_links(console_cli_downloads_spec_links=virtctl_console_cli_downloads_spec_links)
+    return get_all_console_links(
+        console_cli_downloads_spec_links=virtctl_console_cli_downloads_spec_links_scope_function
+    )
 
 
 @pytest.fixture(scope="class")
-def all_virtctl_urls_scope_class(virtctl_console_cli_downloads_spec_links_scope_class):
+def all_virtctl_urls_scope_class(original_virtctl_console_cli_downloads_spec_links_scope_class):
     """This fixture returns URLs for the various OSs to download virtctl"""
-    return get_all_console_links(console_cli_downloads_spec_links=virtctl_console_cli_downloads_spec_links_scope_class)
+    return get_all_console_links(
+        console_cli_downloads_spec_links=original_virtctl_console_cli_downloads_spec_links_scope_class
+    )
 
 
 @pytest.fixture()

tests/install_upgrade_operators/console_cli_download/test_custom_console_cli_download.py

@@ -3,8 +3,8 @@
 from tests.install_upgrade_operators.console_cli_download.utils import (
     CUSTOMIZED_VIRT_DL,
     validate_custom_cli_downloads_urls_updated,
-    validate_custom_cli_urls_downloaded,
 )
+from utilities.infra import download_and_extract_file_from_cluster
 
 
 @pytest.mark.parametrize(
@@ -44,11 +44,12 @@ def test_custom_console_cli_download(
     @pytest.mark.polarion("CNV-12278")
     def test_custom_console_cli_download_links_downloadable(
         self,
-        admin_client,
         tmpdir,
         all_virtctl_urls_scope_function,
     ):
-        validate_custom_cli_urls_downloaded(
-            urls=all_virtctl_urls_scope_function,
-            dest_dir=tmpdir,
-        )
+        not_valid_urls = [
+            url
+            for url in all_virtctl_urls_scope_function
+            if not download_and_extract_file_from_cluster(tmpdir=tmpdir, url=url)
+        ]
+        assert not not_valid_urls, f"Some urls is not valid, {not_valid_urls}"

tests/install_upgrade_operators/console_cli_download/test_disconnected_virtctl.py

@@ -94,8 +94,8 @@ def test_download_and_execute_virtcli_binary_linux(self, downloaded_and_extracte
 @pytest.mark.arm64
 class TestDisconnectedVirtctlAllLinksInternal:
     @pytest.mark.polarion("CNV-6915")
-    def test_all_links_internal(self, all_virtctl_urls_scope_function, non_internal_fqdns):
+    def test_all_links_internal(self, all_virtctl_urls_scope_class, non_internal_fqdns):
         assert not non_internal_fqdns, (
             "Found virtctl URLs that do not point to the cluster internally: "
-            f"violating_fqdns={non_internal_fqdns} all_virtctl_urls={all_virtctl_urls_scope_function}"
+            f"violating_fqdns={non_internal_fqdns} all_virtctl_urls={all_virtctl_urls_scope_class}"
         )

tests/install_upgrade_operators/console_cli_download/utils.py

@@ -1,11 +1,10 @@
 import logging
 
-from _pytest._py.path import LocalPath
 from kubernetes.dynamic import DynamicClient
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 from utilities.constants import TIMEOUT_1MIN, TIMEOUT_5SEC, VIRTCTL_CLI_DOWNLOADS
-from utilities.infra import download_and_extract_file_from_cluster, get_console_spec_links
+from utilities.infra import get_console_spec_links
 
 LOGGER = logging.getLogger(__name__)
 CUSTOMIZED_VIRT_DL = "customized-virt-dl"
@@ -27,23 +26,26 @@ def validate_custom_cli_downloads_urls_updated(
         admin_client (DynamicClient): Kubernetes dynamic client for API operations
         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 list of CLI download URLs. If provided, validates that current
             URLs match these original URLs.
-
-    Returns:
-        None: Function returns when validation succeeds
+            Mutually exclusive with new_hostname.
 
     Raises:
         TimeoutExpiredError: If validation fails within the timeout period (1 minute).
             This can occur when:
             - URLs don't revert to original state within timeout
             - URLs don't get updated with new hostname within timeout
-
-    Note:
-        - Exactly one of new_hostname or original_virtctl_console_cli_downloads_spec_links
-          should be provided, not both
+        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):
+        raise ValueError(
+            "Exactly one of 'new_hostname' or 'original_virtctl_console_cli_downloads_spec_links' "
+            "must be provided, not both or neither."
+        )
+
     samples = TimeoutSampler(
         wait_timeout=TIMEOUT_1MIN,
         sleep=TIMEOUT_5SEC,
@@ -64,17 +66,15 @@ def validate_custom_cli_downloads_urls_updated(
                 if not urls_not_updated_with_new_hostname:
                     return
     except TimeoutExpiredError:
-        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"current_cli_spec_links: {current_cli_spec_links}"
-        ) if original_virtctl_console_cli_downloads_spec_links else (
-            f"Failed to get console spec links: {current_cli_spec_links}, "
-            f"There are urls that are not updated with new hostname: {urls_not_updated_with_new_hostname}"
-        )
+        if original_virtctl_console_cli_downloads_spec_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"current_cli_spec_links: {current_cli_spec_links}"
+            )
+        else:
+            LOGGER.error(
+                f"Failed to get console spec links: {current_cli_spec_links}, "
+                f"There are urls that are not updated with new hostname: {urls_not_updated_with_new_hostname}"
+            )
         raise
-
-
-def validate_custom_cli_urls_downloaded(urls: list[str], dest_dir: LocalPath) -> None:
-    not_valid_urls = [url for url in urls if not download_and_extract_file_from_cluster(tmpdir=dest_dir, url=url)]
-    assert not not_valid_urls, f"Some urls is not valid, {not_valid_urls}"

tests/install_upgrade_operators/product_install/test_install_openshift_virtualization.py

@@ -31,7 +31,7 @@
 CNV_ALERT_CLEANUP_TEST = "test_cnv_installation_alert_cleanup"
 LOGGER = logging.getLogger(__name__)
 
-pytestmark = [pytest.mark.install]
+pytestmark = [pytest.mark.install, pytest.mark.s390x]
 
 
 @pytest.mark.polarion("CNV-10072")