Merge branch 'main' into testGuestLoadMetrics

Author: OhadRevah

libs/vm/vm.py

@@ -13,7 +13,7 @@
 from libs.vm.spec import CloudInitNoCloud, ContainerDisk, Disk, SpecDisk, VMSpec, Volume
 from utilities import infra
 from utilities.constants import CLOUD_INIT_DISK_NAME
-from utilities.infra import get_nodes_cpu_architecture
+from utilities.cpu import get_nodes_cpu_architecture
 from utilities.network import IfaceNotFound
 from utilities.virt import get_oc_image_info, vm_console_run_commands
 

tests/chaos/conftest.py

@@ -17,6 +17,7 @@
     pod_deleting_process_recover,
     terminate_process,
 )
+from utilities.artifactory import get_artifactory_config_map, get_artifactory_secret
 from utilities.constants import (
     KUBEMACPOOL_MAC_CONTROLLER_MANAGER,
     OS_FLAVOR_RHEL,
@@ -34,8 +35,6 @@
 from utilities.infra import (
     ExecCommandOnPod,
     create_ns,
-    get_artifactory_config_map,
-    get_artifactory_secret,
     get_nodes_with_label,
     get_pod_by_name_prefix,
     get_utility_pods_from_nodes,

tests/conftest.py

@@ -71,6 +71,7 @@
 
 import utilities.hco
 from tests.utils import download_and_extract_tar, update_cluster_cpu_model
+from utilities.artifactory import get_artifactory_header, get_http_image_url, get_test_artifact_server_url
 from utilities.bitwarden import get_cnv_tests_secret_by_name
 from utilities.constants import (
     AAQ_NAMESPACE_LABEL,
@@ -124,38 +125,37 @@
     StorageClassNames,
     UpgradeStreams,
 )
+from utilities.cpu import (
+    find_common_cpu_model_for_live_migration,
+    get_common_cpu_from_nodes,
+    get_host_model_cpu,
+    get_nodes_cpu_architecture,
+    get_nodes_cpu_model,
+)
+from utilities.data_utils import base64_encode_str, name_prefix
 from utilities.exceptions import MissingEnvironmentVariableError
 from utilities.infra import (
     ClusterHosts,
     ExecCommandOnPod,
     add_scc_to_service_account,
-    base64_encode_str,
     create_ns,
     download_file_from_cluster,
-    find_common_cpu_model_for_live_migration,
     generate_namespace_name,
     generate_openshift_pull_secret_file,
-    get_artifactory_header,
     get_cluster_platform,
     get_clusterversion,
-    get_common_cpu_from_nodes,
     get_daemonset_yaml_file_with_image_hash,
     get_deployment_by_name,
-    get_host_model_cpu,
-    get_http_image_url,
     get_hyperconverged_resource,
     get_infrastructure,
     get_node_selector_dict,
-    get_nodes_cpu_architecture,
-    get_nodes_cpu_model,
     get_nodes_with_label,
     get_pods,
     get_subscription,
     get_utility_pods_from_nodes,
     label_nodes,
     label_project,
     login_with_user_password,
-    name_prefix,
     run_virtctl_command,
     scale_deployment_replicas,
     wait_for_pods_deletion,
@@ -188,7 +188,6 @@
     data_volume,
     get_default_storage_class,
     get_storage_class_with_specified_volume_mode,
-    get_test_artifact_server_url,
     is_snapshot_supported_by_sc,
     remove_default_storage_classes,
     sc_is_hpp_with_immediate_volume_binding,
@@ -227,7 +226,6 @@
     "accessTokenInactivityTimeout": None,
 }
 CNV_NOT_INSTALLED = "CNV not yet installed."
-EUS_ERROR_CODE = 98
 RWX_FS_STORAGE_CLASS_NAMES_LIST = [
     StorageClassNames.CEPHFS,
     StorageClassNames.TRIDENT_CSI_FSX,
@@ -1906,6 +1904,9 @@ def hco_target_csv_name(cnv_target_version):
 
 @pytest.fixture(scope="session")
 def eus_hco_target_csv_name(eus_target_cnv_version):
+    if eus_target_cnv_version is None:
+        LOGGER.warning("Cannot determine EUS HCO target CSV name: EUS target version is None (non-EUS version)")
+        return None
     return get_hco_csv_name_by_version(cnv_target_version=eus_target_cnv_version)
 
 
@@ -1918,12 +1919,10 @@ def cnv_target_version(pytestconfig):
 def eus_target_cnv_version(pytestconfig, cnv_current_version):
     cnv_current_version = Version(version=cnv_current_version)
     minor = cnv_current_version.minor
-    # EUS-to-EUS upgrades are only viable between even-numbered minor versions, exit if non-eus version
+    # EUS-to-EUS upgrades are only viable between even-numbered minor versions, return None if non-eus version
     if minor % 2:
-        exit_pytest_execution(
-            message=f"EUS upgrade can not be performed from non-eus version: {cnv_current_version}",
-            return_code=EUS_ERROR_CODE,
-        )
+        LOGGER.warning(f"EUS upgrade can not be performed from non-eus version: {cnv_current_version}")
+        return None
     return pytestconfig.option.eus_cnv_target_version or f"{cnv_current_version.major}.{minor + 2}.0"
 
 
@@ -2605,8 +2604,8 @@ def dvs_for_upgrade(
 ):
     golden_images_namespace_name = py_config["golden_images_namespace"]
     dvs_list = []
-    artifactory_secret = utilities.infra.get_artifactory_secret(namespace=golden_images_namespace_name)
-    artifactory_config_map = utilities.infra.get_artifactory_config_map(namespace=golden_images_namespace_name)
+    artifactory_secret = utilities.artifactory.get_artifactory_secret(namespace=golden_images_namespace_name)
+    artifactory_config_map = utilities.artifactory.get_artifactory_config_map(namespace=golden_images_namespace_name)
 
     for sc in py_config["storage_class_matrix"]:
         storage_class = [*sc][0]
@@ -2633,7 +2632,7 @@ def dvs_for_upgrade(
 
     for dv in dvs_list:
         dv.clean_up()
-    utilities.infra.cleanup_artifactory_secret_and_config_map(
+    utilities.artifactory.cleanup_artifactory_secret_and_config_map(
         artifactory_secret=artifactory_secret,
         artifactory_config_map=artifactory_config_map,
     )

tests/global_config.py

@@ -6,6 +6,7 @@
 from ocp_resources.virtual_machine import VirtualMachine
 
 from utilities.architecture import get_cluster_architecture
+from utilities.artifactory import BASE_ARTIFACTORY_LOCATION
 from utilities.constants import (
     AAQ_VIRTUAL_RESOURCES,
     AAQ_VMI_POD_USAGE,
@@ -15,7 +16,6 @@
     ALL_CNV_DEPLOYMENTS_NO_HPP_POOL,
     ALL_CNV_PODS,
     ALL_HCO_RELATED_OBJECTS,
-    BASE_ARTIFACTORY_LOCATION,
     BREW_REGISTERY_SOURCE,
     CENTOS_STREAM9_PREFERENCE,
     CENTOS_STREAM10_PREFERENCE,

tests/infrastructure/golden_images/update_boot_source/test_ssp_common_templates_boot_sources.py

@@ -11,11 +11,13 @@
     assert_missing_golden_image_pvc,
     assert_os_version_mismatch_in_vm,
 )
-from utilities.constants import OS_FLAVOR_FEDORA, RHEL9_STR, TIMEOUT_5MIN, TIMEOUT_5SEC, Images
-from utilities.infra import (
+from utilities.artifactory import (
     cleanup_artifactory_secret_and_config_map,
     get_artifactory_config_map,
     get_artifactory_secret,
+)
+from utilities.constants import OS_FLAVOR_FEDORA, RHEL9_STR, TIMEOUT_5MIN, TIMEOUT_5SEC, Images
+from utilities.infra import (
     validate_os_info_vmi_vs_linux_os,
 )
 from utilities.virt import VirtualMachineForTestsFromTemplate, running_vm

tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py

@@ -18,14 +18,14 @@
     PVC_NOT_FOUND_ERROR,
 )
 from tests.utils import get_parameters_from_template
-from utilities.constants import DATA_SOURCE_NAME, TIMEOUT_5MIN, TIMEOUT_10MIN, Images
-from utilities.exceptions import ResourceValueError
-from utilities.infra import (
+from utilities.artifactory import (
     cleanup_artifactory_secret_and_config_map,
     get_artifactory_config_map,
     get_artifactory_secret,
     get_http_image_url,
 )
+from utilities.constants import DATA_SOURCE_NAME, TIMEOUT_5MIN, TIMEOUT_10MIN, Images
+from utilities.exceptions import ResourceValueError
 from utilities.ssp import wait_for_condition_message_value
 
 LOGGER = logging.getLogger(__name__)

tests/infrastructure/instance_types/supported_os/conftest.py

@@ -5,18 +5,18 @@
 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.artifactory import (
+    cleanup_artifactory_secret_and_config_map,
+    get_artifactory_config_map,
+    get_artifactory_secret,
+)
 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
 

tests/infrastructure/tekton/conftest.py

@@ -23,6 +23,7 @@
     win_iso_download_url_for_pipelineref,
     yaml_files_in_dir,
 )
+from utilities.artifactory import get_artifactory_config_map, get_artifactory_secret
 from utilities.constants import (
     BREW_REGISTERY_SOURCE,
     OS_FLAVOR_FEDORA,
@@ -35,11 +36,9 @@
     TIMEOUT_50MIN,
     WINDOWS_EFI_INSTALLER_STR,
 )
+from utilities.data_utils import base64_encode_str
 from utilities.infra import (
-    base64_encode_str,
     create_ns,
-    get_artifactory_config_map,
-    get_artifactory_secret,
     get_resources_by_name_prefix,
 )
 from utilities.storage import data_volume_template_with_source_ref_dict

tests/infrastructure/tekton/utils.py

@@ -14,6 +14,7 @@
 from ocp_resources.resource import Resource
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
+from utilities.artifactory import get_http_image_url
 from utilities.constants import (
     TIMEOUT_1MIN,
     TIMEOUT_5SEC,
@@ -25,7 +26,6 @@
     WIN_11,
     Images,
 )
-from utilities.infra import get_http_image_url
 
 LOGGER = logging.getLogger(__name__)
 

tests/infrastructure/vhostmd/test_vhostmd.py

@@ -12,9 +12,10 @@
 from pytest_testconfig import config as py_config
 
 from tests.os_params import RHEL_LATEST, RHEL_LATEST_LABELS, RHEL_LATEST_OS
+from utilities.artifactory import get_artifactory_header
 from utilities.constants import TIMEOUT_3MIN, TIMEOUT_30SEC
 from utilities.hco import ResourceEditorValidateHCOReconcile
-from utilities.infra import get_artifactory_header, get_node_selector_dict, get_node_selector_name
+from utilities.infra import get_node_selector_dict, get_node_selector_name
 from utilities.virt import (
     running_vm,
     vm_instance_from_template,