From 9d2b7e37f632d29f70afa4951afd3ec7d74127f3 Mon Sep 17 00:00:00 2001 From: vsibirsk Date: Tue, 23 Jun 2026 11:39:30 +0300 Subject: [PATCH] refactor(storage): migrate utilities.constants imports to submodules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace `from utilities.constants import X` with direct submodule imports across all 57 files in tests/storage/ and tests/data_protection/. `from utilities.constants import Images` is intentionally kept as-is — Images is computed dynamically in __init__.py until the circular import in utilities/architecture.py is resolved. Generated-by: Claude Sonnet 4.6 Signed-off-by: vsibirsk --- tests/data_protection/oadp/conftest.py | 18 ++++++---------- tests/data_protection/oadp/test_velero.py | 10 +++------ tests/data_protection/oadp/utils.py | 5 +---- tests/storage/cdi_clone/conftest.py | 3 ++- tests/storage/cdi_clone/test_clone.py | 10 +++------ tests/storage/cdi_config/test_cdi_config.py | 2 +- tests/storage/cdi_import/conftest.py | 12 +++++------ tests/storage/cdi_import/test_import_http.py | 10 +++------ .../cdi_import/test_import_registry.py | 5 ++++- tests/storage/cdi_import/utils.py | 2 +- tests/storage/cdi_upload/conftest.py | 3 ++- tests/storage/cdi_upload/test_upload.py | 10 +++------ .../storage/cdi_upload/test_upload_virtctl.py | 5 ++++- tests/storage/checkups/conftest.py | 11 +++------- tests/storage/checkups/constants.py | 2 +- tests/storage/checkups/test_checkups.py | 2 +- tests/storage/conftest.py | 21 +++++++------------ tests/storage/constants.py | 3 ++- .../cross_cluster_live_migration/conftest.py | 18 ++++++---------- .../cross_cluster_live_migration/test_cclm.py | 2 +- .../cross_cluster_live_migration/utils.py | 3 ++- tests/storage/data_import_cron/conftest.py | 5 ++++- tests/storage/general/conftest.py | 7 ++++++- .../storage/general/test_storage_behavior.py | 4 +++- .../golden_image/test_cached_snapshots.py | 4 +++- .../storage/golden_image/test_golden_image.py | 3 ++- tests/storage/hpp/conftest.py | 2 +- tests/storage/hpp/test_hostpath.py | 8 ++----- tests/storage/hpp/test_hpp_node_placement.py | 2 +- tests/storage/hpp/utils.py | 11 +++------- tests/storage/memory_dump/conftest.py | 3 ++- tests/storage/memory_dump/utils.py | 2 +- tests/storage/online_resize/conftest.py | 4 +++- .../online_resize/test_online_resize.py | 2 +- tests/storage/online_resize/utils.py | 2 +- .../restricted_namespace_cloning/conftest.py | 5 ++++- .../test_restricted_namespace_cloning.py | 3 ++- .../test_restricted_namespace_cloning_vms.py | 4 +++- .../restricted_namespace_cloning/utils.py | 2 +- tests/storage/snapshots/conftest.py | 3 ++- tests/storage/snapshots/test_snapshots.py | 3 ++- tests/storage/snapshots/utils.py | 2 +- tests/storage/storage_migration/conftest.py | 13 ++++-------- .../test_storage_class_migration.py | 2 +- tests/storage/storage_migration/utils.py | 2 +- tests/storage/test_cdi_certificate.py | 13 ++++-------- tests/storage/test_cdi_resources.py | 9 ++++---- tests/storage/test_data_import_cron.py | 12 +++-------- tests/storage/test_hotplug.py | 3 ++- tests/storage/test_libguestfs.py | 3 ++- tests/storage/test_wffc.py | 9 +++----- tests/storage/upgrade/conftest.py | 2 +- tests/storage/upgrade/test_upgrade_storage.py | 4 +++- tests/storage/utils.py | 14 ++++--------- tests/storage/vm_export/conftest.py | 4 +++- tests/storage/vm_export/utils.py | 2 +- 56 files changed, 145 insertions(+), 185 deletions(-) diff --git a/tests/data_protection/oadp/conftest.py b/tests/data_protection/oadp/conftest.py index 7f0aa27cee..d378a63a19 100644 --- a/tests/data_protection/oadp/conftest.py +++ b/tests/data_protection/oadp/conftest.py @@ -14,18 +14,12 @@ get_artifactory_secret, get_test_artifact_server_url, ) -from utilities.constants import ( - BACKUP_STORAGE_LOCATION, - CONTAINER_DISK_IMAGE_PATH_STR, - FILE_NAME_FOR_BACKUP, - OS_FLAVOR_RHEL, - OS_FLAVOR_WIN_CONTAINER_DISK, - TEXT_TO_TEST, - TIMEOUT_8MIN, - TIMEOUT_15MIN, - U1_LARGE, - Images, -) +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_RHEL, OS_FLAVOR_WIN_CONTAINER_DISK +from utilities.constants.instance_types import U1_LARGE +from utilities.constants.oadp import BACKUP_STORAGE_LOCATION, FILE_NAME_FOR_BACKUP, TEXT_TO_TEST +from utilities.constants.os_matrix import CONTAINER_DISK_IMAGE_PATH_STR +from utilities.constants.timeouts import TIMEOUT_8MIN, TIMEOUT_15MIN from utilities.infra import create_ns from utilities.oadp import ( VeleroBackup, diff --git a/tests/data_protection/oadp/test_velero.py b/tests/data_protection/oadp/test_velero.py index 31f028984c..8db91fdeac 100644 --- a/tests/data_protection/oadp/test_velero.py +++ b/tests/data_protection/oadp/test_velero.py @@ -2,13 +2,9 @@ from ocp_resources.datavolume import DataVolume from tests.data_protection.oadp.utils import FILE_PATH_FOR_WINDOWS_BACKUP, wait_for_restored_dv -from utilities.constants import ( - FILE_NAME_FOR_BACKUP, - TEXT_TO_TEST, - TIMEOUT_10SEC, - TIMEOUT_15MIN, - Images, -) +from utilities.constants import Images +from utilities.constants.oadp import FILE_NAME_FOR_BACKUP, TEXT_TO_TEST +from utilities.constants.timeouts import TIMEOUT_10SEC, TIMEOUT_15MIN from utilities.oadp import check_file_in_running_vm from utilities.storage import verify_file_in_windows_vm from utilities.virt import wait_for_running_vm diff --git a/tests/data_protection/oadp/utils.py b/tests/data_protection/oadp/utils.py index 34f4d005fc..d9ba47d305 100644 --- a/tests/data_protection/oadp/utils.py +++ b/tests/data_protection/oadp/utils.py @@ -3,10 +3,7 @@ from ocp_resources.datavolume import DataVolume from ocp_resources.persistent_volume_claim import PersistentVolumeClaim -from utilities.constants import ( - TIMEOUT_10SEC, - TIMEOUT_15SEC, -) +from utilities.constants.timeouts import TIMEOUT_10SEC, TIMEOUT_15SEC FILE_PATH_FOR_WINDOWS_BACKUP = "C:/oadp_file_before_backup.txt" diff --git a/tests/storage/cdi_clone/conftest.py b/tests/storage/cdi_clone/conftest.py index 7647297a4d..56e3c02790 100644 --- a/tests/storage/cdi_clone/conftest.py +++ b/tests/storage/cdi_clone/conftest.py @@ -2,7 +2,8 @@ from ocp_resources.datavolume import DataVolume from tests.storage.constants import QUAY_FEDORA_CONTAINER_IMAGE -from utilities.constants import REGISTRY_STR, Images +from utilities.constants import Images +from utilities.constants.storage import REGISTRY_STR from utilities.storage import create_dv, data_volume diff --git a/tests/storage/cdi_clone/test_clone.py b/tests/storage/cdi_clone/test_clone.py index a6667224e9..3ecbdc7458 100644 --- a/tests/storage/cdi_clone/test_clone.py +++ b/tests/storage/cdi_clone/test_clone.py @@ -11,13 +11,9 @@ assert_use_populator, create_windows_vm_validate_guest_agent_info, ) -from utilities.constants import ( - OS_FLAVOR_FEDORA, - OS_FLAVOR_WINDOWS, - TIMEOUT_1MIN, - TIMEOUT_40MIN, - Images, -) +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA, OS_FLAVOR_WINDOWS +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_40MIN from utilities.storage import ( check_disk_count_in_vm, create_dv, diff --git a/tests/storage/cdi_config/test_cdi_config.py b/tests/storage/cdi_config/test_cdi_config.py index d3bd47255c..5029cb4f0e 100644 --- a/tests/storage/cdi_config/test_cdi_config.py +++ b/tests/storage/cdi_config/test_cdi_config.py @@ -6,7 +6,7 @@ from timeout_sampler import TimeoutSampler from tests.storage.utils import LOGGER -from utilities.constants import CDI_UPLOADPROXY +from utilities.constants.components import CDI_UPLOADPROXY from utilities.hco import ResourceEditorValidateHCOReconcile pytestmark = pytest.mark.post_upgrade diff --git a/tests/storage/cdi_import/conftest.py b/tests/storage/cdi_import/conftest.py index c5edfe6948..e405be127e 100644 --- a/tests/storage/cdi_import/conftest.py +++ b/tests/storage/cdi_import/conftest.py @@ -18,13 +18,11 @@ create_pod_for_pvc, get_file_url, ) -from utilities.constants import ( - LINUX_BRIDGE, - OS_FLAVOR_FEDORA, - REGISTRY_STR, - TIMEOUT_1MIN, - Images, -) +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA +from utilities.constants.networking import LINUX_BRIDGE +from utilities.constants.storage import REGISTRY_STR +from utilities.constants.timeouts import TIMEOUT_1MIN from utilities.infra import NON_EXIST_URL from utilities.network import network_device, network_nad from utilities.storage import create_dv, sc_volume_binding_mode_is_wffc diff --git a/tests/storage/cdi_import/test_import_http.py b/tests/storage/cdi_import/test_import_http.py index 35587379bc..39b5705122 100644 --- a/tests/storage/cdi_import/test_import_http.py +++ b/tests/storage/cdi_import/test_import_http.py @@ -23,13 +23,9 @@ get_file_url, wait_for_dv_condition_message, ) -from utilities.constants import ( - QUARANTINED, - TIMEOUT_1MIN, - TIMEOUT_2MIN, - TIMEOUT_5MIN, - Images, -) +from utilities.constants import Images +from utilities.constants.pytest import QUARANTINED +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_2MIN, TIMEOUT_5MIN from utilities.ssp import validate_os_info_vmi_vs_windows_os from utilities.storage import ( ErrorMsg, diff --git a/tests/storage/cdi_import/test_import_registry.py b/tests/storage/cdi_import/test_import_registry.py index 47b6532e31..58ff9513e0 100644 --- a/tests/storage/cdi_import/test_import_registry.py +++ b/tests/storage/cdi_import/test_import_registry.py @@ -8,7 +8,10 @@ from tests.storage.constants import QUAY_FEDORA_CONTAINER_IMAGE from tests.storage.utils import wait_for_dv_condition_message -from utilities.constants import OS_FLAVOR_FEDORA, REGISTRY_STR, TIMEOUT_5MIN, Images +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA +from utilities.constants.storage import REGISTRY_STR +from utilities.constants.timeouts import TIMEOUT_5MIN from utilities.storage import ErrorMsg, check_disk_count_in_vm, create_dv, create_vm_from_dv from utilities.virt import running_vm diff --git a/tests/storage/cdi_import/utils.py b/tests/storage/cdi_import/utils.py index c569ed7215..386ba81796 100644 --- a/tests/storage/cdi_import/utils.py +++ b/tests/storage/cdi_import/utils.py @@ -9,7 +9,7 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler from tests.storage.utils import get_importer_pod -from utilities.constants import TIMEOUT_1MIN, TIMEOUT_5SEC, TIMEOUT_20SEC +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_5SEC, TIMEOUT_20SEC if TYPE_CHECKING: from ocp_resources.persistent_volume_claim import PersistentVolumeClaim diff --git a/tests/storage/cdi_upload/conftest.py b/tests/storage/cdi_upload/conftest.py index b40f0a1824..b8149c0905 100644 --- a/tests/storage/cdi_upload/conftest.py +++ b/tests/storage/cdi_upload/conftest.py @@ -11,7 +11,8 @@ from libs.net.ip import random_ipv4_address from libs.net.udn import create_udn_namespace -from utilities.constants import TIMEOUT_1MIN, TIMEOUT_2MIN, Images +from utilities.constants import Images +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_2MIN from utilities.storage import check_upload_virtctl_result, create_dv, get_downloaded_artifact, virtctl_upload_dv LOGGER = logging.getLogger(__name__) diff --git a/tests/storage/cdi_upload/test_upload.py b/tests/storage/cdi_upload/test_upload.py index 74d856201c..be7d29b1a2 100644 --- a/tests/storage/cdi_upload/test_upload.py +++ b/tests/storage/cdi_upload/test_upload.py @@ -18,13 +18,9 @@ import tests.storage.utils as storage_utils import utilities.storage -from utilities.constants import ( - CDI_UPLOADPROXY, - TIMEOUT_1MIN, - TIMEOUT_3MIN, - TIMEOUT_5MIN, - Images, -) +from utilities.constants import Images +from utilities.constants.components import CDI_UPLOADPROXY +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_3MIN, TIMEOUT_5MIN from utilities.storage import create_vm_from_dv, get_downloaded_artifact LOGGER = logging.getLogger(__name__) diff --git a/tests/storage/cdi_upload/test_upload_virtctl.py b/tests/storage/cdi_upload/test_upload_virtctl.py index e86811ec04..11ac2ee5f4 100644 --- a/tests/storage/cdi_upload/test_upload_virtctl.py +++ b/tests/storage/cdi_upload/test_upload_virtctl.py @@ -15,7 +15,10 @@ from libs.net.cluster import is_ipv6_single_stack_cluster from tests.storage.cdi_upload.utils import get_storage_profile_minimum_supported_pvc_size from tests.storage.utils import assert_use_populator, create_windows_vm_validate_guest_agent_info -from utilities.constants import CDI_UPLOADPROXY, QUARANTINED, TIMEOUT_1MIN, Images +from utilities.constants import Images +from utilities.constants.components import CDI_UPLOADPROXY +from utilities.constants.pytest import QUARANTINED +from utilities.constants.timeouts import TIMEOUT_1MIN from utilities.storage import ( ErrorMsg, check_upload_virtctl_result, diff --git a/tests/storage/checkups/conftest.py b/tests/storage/checkups/conftest.py index b17d7b9ee2..883796df78 100644 --- a/tests/storage/checkups/conftest.py +++ b/tests/storage/checkups/conftest.py @@ -24,14 +24,9 @@ ) from tests.storage.checkups.utils import update_storage_profile from tests.utils import create_cirros_vm, get_image_from_csv -from utilities.constants import ( - BIND_IMMEDIATE_ANNOTATION, - OUTDATED, - TIMEOUT_10MIN, - VALUE_STR, - WILDCARD_CRON_EXPRESSION, - StorageClassNames, -) +from utilities.constants.cluster import VALUE_STR +from utilities.constants.storage import BIND_IMMEDIATE_ANNOTATION, OUTDATED, WILDCARD_CRON_EXPRESSION, StorageClassNames +from utilities.constants.timeouts import TIMEOUT_10MIN from utilities.exceptions import StorageCheckupConditionTimeoutExpiredError from utilities.infra import create_ns, get_pods from utilities.storage import update_default_sc diff --git a/tests/storage/checkups/constants.py b/tests/storage/checkups/constants.py index adee381940..2fc17a24cd 100644 --- a/tests/storage/checkups/constants.py +++ b/tests/storage/checkups/constants.py @@ -1,6 +1,6 @@ from ocp_resources.resource import Resource -from utilities.constants import CREATE_STR, DELETE_STR, GET_STR, UPDATE_STR +from utilities.constants.cluster import CREATE_STR, DELETE_STR, GET_STR, UPDATE_STR ACCESS_MODES = "accessModes" NON_EXISTENT_STR = "nonexistent" diff --git a/tests/storage/checkups/test_checkups.py b/tests/storage/checkups/test_checkups.py index 7db7e1a325..bd8371198c 100644 --- a/tests/storage/checkups/test_checkups.py +++ b/tests/storage/checkups/test_checkups.py @@ -5,7 +5,7 @@ from ocp_resources.job import Job from tests.storage.checkups.utils import assert_results_in_configmap -from utilities.constants import QUARANTINED +from utilities.constants.pytest import QUARANTINED MSG_MIGRATION_FAIL = "cannot migrate VMI" MSG_MIGRATION_SUCCESS = "migration completed" diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py index 98e9f17e92..42c5747a70 100644 --- a/tests/storage/conftest.py +++ b/tests/storage/conftest.py @@ -43,20 +43,13 @@ ) from tests.utils import create_cirros_vm from utilities.artifactory import get_artifactory_config_map, get_artifactory_secret -from utilities.constants import ( - CDI_OPERATOR, - CDI_UPLOADPROXY, - CNV_TEST_SERVICE_ACCOUNT, - OS_FLAVOR_FEDORA, - OS_FLAVOR_RHEL, - RHEL10_PREFERENCE, - SECURITY_CONTEXT, - TIMEOUT_1MIN, - TIMEOUT_5SEC, - TIMEOUT_30MIN, - U1_SMALL, - Images, -) +from utilities.constants import Images +from utilities.constants.cluster import CNV_TEST_SERVICE_ACCOUNT +from utilities.constants.components import CDI_OPERATOR, CDI_UPLOADPROXY +from utilities.constants.images import OS_FLAVOR_FEDORA, OS_FLAVOR_RHEL +from utilities.constants.instance_types import RHEL10_PREFERENCE, U1_SMALL +from utilities.constants.networking import SECURITY_CONTEXT +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_5SEC, TIMEOUT_30MIN from utilities.hco import ( ResourceEditorValidateHCOReconcile, hco_cr_jsonpatch_annotations_dict, diff --git a/tests/storage/constants.py b/tests/storage/constants.py index 4b223f9452..36c7ad452e 100644 --- a/tests/storage/constants.py +++ b/tests/storage/constants.py @@ -1,4 +1,5 @@ -from utilities.constants import Images, StorageClassNames +from utilities.constants import Images +from utilities.constants.storage import StorageClassNames from utilities.storage import HppCsiStorageClass CIRROS_QCOW2_IMG = f"{Images.Cirros.DIR}/{Images.Cirros.QCOW2_IMG}" diff --git a/tests/storage/cross_cluster_live_migration/conftest.py b/tests/storage/cross_cluster_live_migration/conftest.py index 613fb58352..fb7958f3e1 100644 --- a/tests/storage/cross_cluster_live_migration/conftest.py +++ b/tests/storage/cross_cluster_live_migration/conftest.py @@ -41,18 +41,12 @@ get_artifactory_secret, get_test_artifact_server_url, ) -from utilities.constants import ( - CONTAINER_DISK_IMAGE_PATH_STR, - OS_FLAVOR_RHEL, - OS_FLAVOR_WIN_CONTAINER_DISK, - RHEL10_PREFERENCE, - RHEL10_STR, - TIMEOUT_1MIN, - TIMEOUT_30SEC, - U1_LARGE, - U1_SMALL, - Images, -) +from utilities.constants import Images +from utilities.constants.components import RHEL10_STR +from utilities.constants.images import OS_FLAVOR_RHEL, OS_FLAVOR_WIN_CONTAINER_DISK +from utilities.constants.instance_types import RHEL10_PREFERENCE, U1_LARGE, U1_SMALL +from utilities.constants.os_matrix import CONTAINER_DISK_IMAGE_PATH_STR +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_30SEC from utilities.infra import create_ns, get_hyperconverged_resource from utilities.storage import ( data_volume_template_with_source_ref_dict, diff --git a/tests/storage/cross_cluster_live_migration/test_cclm.py b/tests/storage/cross_cluster_live_migration/test_cclm.py index 02b15e826d..b453eb31f7 100644 --- a/tests/storage/cross_cluster_live_migration/test_cclm.py +++ b/tests/storage/cross_cluster_live_migration/test_cclm.py @@ -20,7 +20,7 @@ wait_for_vms_to_be_stopped, ) from tests.storage.utils import check_file_in_vm -from utilities.constants import TIMEOUT_10MIN, TIMEOUT_50MIN +from utilities.constants.timeouts import TIMEOUT_10MIN, TIMEOUT_50MIN if TYPE_CHECKING: from kubernetes.dynamic import DynamicClient diff --git a/tests/storage/cross_cluster_live_migration/utils.py b/tests/storage/cross_cluster_live_migration/utils.py index 061f46b569..404c412caa 100644 --- a/tests/storage/cross_cluster_live_migration/utils.py +++ b/tests/storage/cross_cluster_live_migration/utils.py @@ -9,7 +9,8 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler from utilities import console -from utilities.constants import TIMEOUT_3MIN, TIMEOUT_5SEC, VIRT_HANDLER +from utilities.constants.components import VIRT_HANDLER +from utilities.constants.timeouts import TIMEOUT_3MIN, TIMEOUT_5SEC from utilities.hco import ResourceEditorValidateHCOReconcile from utilities.infra import get_daemonset_by_name from utilities.virt import VirtualMachineForTests, migrate_vm_and_verify, wait_for_virt_handler_pods_network_updated diff --git a/tests/storage/data_import_cron/conftest.py b/tests/storage/data_import_cron/conftest.py index 70a04590ce..a785331dd7 100644 --- a/tests/storage/data_import_cron/conftest.py +++ b/tests/storage/data_import_cron/conftest.py @@ -8,7 +8,10 @@ from tests.storage.constants import QUAY_FEDORA_CONTAINER_IMAGE from tests.storage.utils import create_role_binding -from utilities.constants import BIND_IMMEDIATE_ANNOTATION, OS_FLAVOR_FEDORA, REGISTRY_STR, TIMEOUT_10MIN, Images +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA +from utilities.constants.storage import BIND_IMMEDIATE_ANNOTATION, REGISTRY_STR +from utilities.constants.timeouts import TIMEOUT_10MIN from utilities.infra import create_ns from utilities.storage import create_dv, data_volume_template_with_source_ref_dict from utilities.virt import VirtualMachineForTests, running_vm diff --git a/tests/storage/general/conftest.py b/tests/storage/general/conftest.py index a520354d8e..02c0f61f34 100644 --- a/tests/storage/general/conftest.py +++ b/tests/storage/general/conftest.py @@ -11,7 +11,12 @@ from tests.storage.cdi_import.utils import get_importer_pod_node, wait_dv_and_get_importer from tests.storage.constants import QUAY_FEDORA_CONTAINER_IMAGE -from utilities.constants import AMD_64, OS_FLAVOR_FEDORA, REGISTRY_STR, TIMEOUT_5MIN, TIMEOUT_12MIN, U1_SMALL, Images +from utilities.constants import Images +from utilities.constants.architecture import AMD_64 +from utilities.constants.images import OS_FLAVOR_FEDORA +from utilities.constants.instance_types import U1_SMALL +from utilities.constants.storage import REGISTRY_STR +from utilities.constants.timeouts import TIMEOUT_5MIN, TIMEOUT_12MIN from utilities.storage import create_dv, data_volume_template_with_source_ref_dict, get_dv_size_from_datasource from utilities.virt import VirtualMachineForTests, running_vm diff --git a/tests/storage/general/test_storage_behavior.py b/tests/storage/general/test_storage_behavior.py index 30124c8ef7..ccf981b44e 100644 --- a/tests/storage/general/test_storage_behavior.py +++ b/tests/storage/general/test_storage_behavior.py @@ -8,7 +8,9 @@ from tests.storage.cdi_import.utils import wait_for_pvc_recreate from utilities import console -from utilities.constants import OS_FLAVOR_FEDORA, TIMEOUT_1MIN, Images +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA +from utilities.constants.timeouts import TIMEOUT_1MIN from utilities.infra import get_node_selector_dict from utilities.storage import create_dummy_first_consumer_pod, create_vm_from_dv, sc_volume_binding_mode_is_wffc diff --git a/tests/storage/golden_image/test_cached_snapshots.py b/tests/storage/golden_image/test_cached_snapshots.py index 6f221a50af..a5963f96f8 100644 --- a/tests/storage/golden_image/test_cached_snapshots.py +++ b/tests/storage/golden_image/test_cached_snapshots.py @@ -11,7 +11,9 @@ from ocp_resources.volume_snapshot import VolumeSnapshot from tests.os_params import RHEL_LATEST_LABELS -from utilities.constants import DATA_IMPORT_CRON_ENABLE, RHEL9_STR, TIMEOUT_3MIN +from utilities.constants.components import RHEL9_STR +from utilities.constants.hco import DATA_IMPORT_CRON_ENABLE +from utilities.constants.timeouts import TIMEOUT_3MIN from utilities.hco import ( disable_common_boot_image_import_hco_spec, update_hco_templates_spec, diff --git a/tests/storage/golden_image/test_golden_image.py b/tests/storage/golden_image/test_golden_image.py index 251bc89092..2e16a46328 100644 --- a/tests/storage/golden_image/test_golden_image.py +++ b/tests/storage/golden_image/test_golden_image.py @@ -7,7 +7,8 @@ from pytest_testconfig import config as py_config from tests.os_params import RHEL_LATEST -from utilities.constants import PVC, TIMEOUT_20MIN +from utilities.constants.storage import PVC +from utilities.constants.timeouts import TIMEOUT_20MIN from utilities.storage import ErrorMsg, create_dv, get_dv_size_from_datasource pytestmark = pytest.mark.post_upgrade diff --git a/tests/storage/hpp/conftest.py b/tests/storage/hpp/conftest.py index 5e7e61344a..83c7e7d159 100644 --- a/tests/storage/hpp/conftest.py +++ b/tests/storage/hpp/conftest.py @@ -13,7 +13,7 @@ wait_for_desired_hpp_pods_running, ) from tests.utils import create_cirros_vm -from utilities.constants import TIMEOUT_5MIN +from utilities.constants.timeouts import TIMEOUT_5MIN from utilities.hco import add_labels_to_nodes from utilities.infra import ( get_node_selector_dict, diff --git a/tests/storage/hpp/test_hostpath.py b/tests/storage/hpp/test_hostpath.py index 1bf3a9b017..c003311c5f 100644 --- a/tests/storage/hpp/test_hostpath.py +++ b/tests/storage/hpp/test_hostpath.py @@ -20,12 +20,8 @@ from ocp_resources.service_account import ServiceAccount from ocp_resources.service_monitor import ServiceMonitor -from utilities.constants import ( - HOSTPATH_PROVISIONER_OPERATOR, - HPP_POOL, - TIMEOUT_1MIN, - TIMEOUT_5MIN, -) +from utilities.constants.components import HOSTPATH_PROVISIONER_OPERATOR, HPP_POOL +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_5MIN from utilities.infra import get_pod_by_name_prefix LOGGER = logging.getLogger(__name__) diff --git a/tests/storage/hpp/test_hpp_node_placement.py b/tests/storage/hpp/test_hpp_node_placement.py index 47c8e51086..4026369595 100644 --- a/tests/storage/hpp/test_hpp_node_placement.py +++ b/tests/storage/hpp/test_hpp_node_placement.py @@ -14,7 +14,7 @@ VM_NAME, edit_hpp_with_node_selector, ) -from utilities.constants import NODE_STR +from utilities.constants.aaq import NODE_STR from utilities.storage import check_disk_count_in_vm LOGGER = logging.getLogger(__name__) diff --git a/tests/storage/hpp/utils.py b/tests/storage/hpp/utils.py index d16ea9b249..d1d40ffb31 100644 --- a/tests/storage/hpp/utils.py +++ b/tests/storage/hpp/utils.py @@ -14,14 +14,9 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler from utilities.artifactory import get_http_image_url -from utilities.constants import ( - HOSTPATH_PROVISIONER_CSI, - HOSTPATH_PROVISIONER_OPERATOR, - HPP_POOL, - TIMEOUT_1MIN, - TIMEOUT_2MIN, - Images, -) +from utilities.constants import Images +from utilities.constants.components import HOSTPATH_PROVISIONER_CSI, HOSTPATH_PROVISIONER_OPERATOR, HPP_POOL +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_2MIN from utilities.infra import ( ExecCommandOnPod, get_resources_by_name_prefix, diff --git a/tests/storage/memory_dump/conftest.py b/tests/storage/memory_dump/conftest.py index 9020107baa..0c3f00d8dd 100644 --- a/tests/storage/memory_dump/conftest.py +++ b/tests/storage/memory_dump/conftest.py @@ -7,7 +7,8 @@ from ocp_resources.persistent_volume_claim import PersistentVolumeClaim from tests.storage.memory_dump.utils import wait_for_memory_dump_status_completed -from utilities.constants import TIMEOUT_2MIN, Images +from utilities.constants import Images +from utilities.constants.timeouts import TIMEOUT_2MIN from utilities.storage import PodWithPVC, get_containers_for_pods_with_pvc, virtctl_memory_dump from utilities.virt import running_vm, vm_instance_from_template diff --git a/tests/storage/memory_dump/utils.py b/tests/storage/memory_dump/utils.py index 1c782e33b7..98ad321b86 100644 --- a/tests/storage/memory_dump/utils.py +++ b/tests/storage/memory_dump/utils.py @@ -1,7 +1,7 @@ from ocp_resources.virtual_machine import VirtualMachine from timeout_sampler import retry -from utilities.constants import TIMEOUT_2MIN, TIMEOUT_5SEC +from utilities.constants.timeouts import TIMEOUT_2MIN, TIMEOUT_5SEC from utilities.virt import VirtualMachineForTests diff --git a/tests/storage/online_resize/conftest.py b/tests/storage/online_resize/conftest.py index d726e1e83b..e1c013a4d1 100644 --- a/tests/storage/online_resize/conftest.py +++ b/tests/storage/online_resize/conftest.py @@ -12,7 +12,9 @@ expand_pvc, wait_for_resize, ) -from utilities.constants import OS_FLAVOR_RHEL, Images, StorageClassNames +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_RHEL +from utilities.constants.storage import StorageClassNames from utilities.storage import create_dv, is_snapshot_supported_by_sc from utilities.virt import VirtualMachineForTests, running_vm diff --git a/tests/storage/online_resize/test_online_resize.py b/tests/storage/online_resize/test_online_resize.py index bfe22f9f63..1569b1c5d4 100644 --- a/tests/storage/online_resize/test_online_resize.py +++ b/tests/storage/online_resize/test_online_resize.py @@ -19,7 +19,7 @@ vm_restore, wait_for_resize, ) -from utilities.constants import TIMEOUT_1MIN, TIMEOUT_4MIN, TIMEOUT_5SEC +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_4MIN, TIMEOUT_5SEC from utilities.storage import add_dv_to_vm, create_dv, vm_snapshot from utilities.virt import migrate_vm_and_verify, running_vm diff --git a/tests/storage/online_resize/utils.py b/tests/storage/online_resize/utils.py index 0d37c5a543..4c7ffe70b3 100644 --- a/tests/storage/online_resize/utils.py +++ b/tests/storage/online_resize/utils.py @@ -11,7 +11,7 @@ from pyhelper_utils.shell import run_ssh_commands from timeout_sampler import TimeoutExpiredError, TimeoutSampler -from utilities.constants import TIMEOUT_2MIN, TIMEOUT_4MIN, TIMEOUT_5SEC +from utilities.constants.timeouts import TIMEOUT_2MIN, TIMEOUT_4MIN, TIMEOUT_5SEC from utilities.storage import create_dv from utilities.virt import running_vm diff --git a/tests/storage/restricted_namespace_cloning/conftest.py b/tests/storage/restricted_namespace_cloning/conftest.py index 2c32aed135..374b64d5b7 100644 --- a/tests/storage/restricted_namespace_cloning/conftest.py +++ b/tests/storage/restricted_namespace_cloning/conftest.py @@ -30,7 +30,10 @@ create_role_binding, set_permissions, ) -from utilities.constants import OS_FLAVOR_FEDORA, PVC, UNPRIVILEGED_USER, Images +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA +from utilities.constants.pytest import UNPRIVILEGED_USER +from utilities.constants.storage import PVC from utilities.infra import create_ns from utilities.storage import create_dv, get_dv_size_from_datasource from utilities.virt import VirtualMachineForTests, running_vm diff --git a/tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning.py b/tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning.py index d1d009b6f4..0339262d56 100644 --- a/tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning.py +++ b/tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning.py @@ -22,7 +22,8 @@ VERBS_SRC, ) from tests.storage.restricted_namespace_cloning.utils import create_dv_negative, verify_snapshot_used_namespace_transfer -from utilities.constants import OS_FLAVOR_FEDORA, Images +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA from utilities.storage import create_vm_from_dv LOGGER = logging.getLogger(__name__) diff --git a/tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning_vms.py b/tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning_vms.py index ec97b533a0..bf32fb0c7a 100644 --- a/tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning_vms.py +++ b/tests/storage/restricted_namespace_cloning/test_restricted_namespace_cloning_vms.py @@ -28,7 +28,9 @@ VM_FOR_TEST, ) from tests.storage.restricted_namespace_cloning.utils import verify_snapshot_used_namespace_transfer -from utilities.constants import OS_FLAVOR_FEDORA, QUARANTINED, Images +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA +from utilities.constants.pytest import QUARANTINED from utilities.storage import ErrorMsg from utilities.virt import VirtualMachineForTests diff --git a/tests/storage/restricted_namespace_cloning/utils.py b/tests/storage/restricted_namespace_cloning/utils.py index aca9da6a6a..589eb37644 100644 --- a/tests/storage/restricted_namespace_cloning/utils.py +++ b/tests/storage/restricted_namespace_cloning/utils.py @@ -7,7 +7,7 @@ from tests.storage.restricted_namespace_cloning.constants import TARGET_DV from tests.storage.utils import assert_pvc_snapshot_clone_annotation -from utilities.constants import PVC +from utilities.constants.storage import PVC from utilities.storage import ( ErrorMsg, create_dv, diff --git a/tests/storage/snapshots/conftest.py b/tests/storage/snapshots/conftest.py index 0272af0978..ca5d547bf6 100644 --- a/tests/storage/snapshots/conftest.py +++ b/tests/storage/snapshots/conftest.py @@ -19,7 +19,8 @@ create_windows_directory, set_permissions, ) -from utilities.constants import TIMEOUT_2MIN, TIMEOUT_5SEC, TIMEOUT_10MIN, UNPRIVILEGED_USER +from utilities.constants.pytest import UNPRIVILEGED_USER +from utilities.constants.timeouts import TIMEOUT_2MIN, TIMEOUT_5SEC, TIMEOUT_10MIN LOGGER = logging.getLogger(__name__) diff --git a/tests/storage/snapshots/test_snapshots.py b/tests/storage/snapshots/test_snapshots.py index dbe2b1ba8b..ec1a336146 100644 --- a/tests/storage/snapshots/test_snapshots.py +++ b/tests/storage/snapshots/test_snapshots.py @@ -23,7 +23,8 @@ start_windows_vm_after_restore, ) from tests.storage.utils import assert_windows_directory_existence -from utilities.constants import LS_COMMAND, TIMEOUT_1MIN, TIMEOUT_10SEC +from utilities.constants.cluster import LS_COMMAND +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_10SEC from utilities.storage import run_command_on_vm_and_check_output from utilities.virt import restart_vm_wait_for_running_vm, running_vm diff --git a/tests/storage/snapshots/utils.py b/tests/storage/snapshots/utils.py index 5a17f2b19a..40d74d84ef 100644 --- a/tests/storage/snapshots/utils.py +++ b/tests/storage/snapshots/utils.py @@ -3,7 +3,7 @@ from ocp_resources.virtual_machine_snapshot import VirtualMachineSnapshot from tests.storage.snapshots.constants import ERROR_MSG_USER_CANNOT_CREATE_VM_SNAPSHOTS -from utilities.constants import TIMEOUT_10MIN +from utilities.constants.timeouts import TIMEOUT_10MIN from utilities.virt import running_vm diff --git a/tests/storage/storage_migration/conftest.py b/tests/storage/storage_migration/conftest.py index 3e78012b03..f94987771d 100644 --- a/tests/storage/storage_migration/conftest.py +++ b/tests/storage/storage_migration/conftest.py @@ -25,15 +25,10 @@ ) from tests.storage.utils import create_windows_directory, get_storage_class_for_storage_migration from utilities.artifactory import get_http_image_url -from utilities.constants import ( - OS_FLAVOR_FEDORA, - OS_FLAVOR_RHEL, - OS_FLAVOR_WINDOWS, - TIMEOUT_2MIN, - TIMEOUT_5SEC, - U1_SMALL, - Images, -) +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_FEDORA, OS_FLAVOR_RHEL, OS_FLAVOR_WINDOWS +from utilities.constants.instance_types import U1_SMALL +from utilities.constants.timeouts import TIMEOUT_2MIN, TIMEOUT_5SEC from utilities.infra import create_ns from utilities.storage import ( create_dv, diff --git a/tests/storage/storage_migration/test_storage_class_migration.py b/tests/storage/storage_migration/test_storage_class_migration.py index d7fc245cdb..403ea545d8 100644 --- a/tests/storage/storage_migration/test_storage_class_migration.py +++ b/tests/storage/storage_migration/test_storage_class_migration.py @@ -18,7 +18,7 @@ verify_vm_storage_class_updated, verify_vms_boot_time_after_storage_migration, ) -from utilities.constants import TIMEOUT_60MIN +from utilities.constants.timeouts import TIMEOUT_60MIN from utilities.storage import verify_file_in_windows_vm from utilities.virt import migrate_vm_and_verify diff --git a/tests/storage/storage_migration/utils.py b/tests/storage/storage_migration/utils.py index 414ad9b73d..ae2742dcc1 100644 --- a/tests/storage/storage_migration/utils.py +++ b/tests/storage/storage_migration/utils.py @@ -11,7 +11,7 @@ MOUNT_HOTPLUGGED_DEVICE_PATH, ) from tests.storage.utils import check_file_in_vm -from utilities.constants import TIMEOUT_2MIN, TIMEOUT_5SEC, TIMEOUT_10MIN, TIMEOUT_10SEC +from utilities.constants.timeouts import TIMEOUT_2MIN, TIMEOUT_5SEC, TIMEOUT_10MIN, TIMEOUT_10SEC from utilities.exceptions import StorageMigrationError from utilities.virt import VirtualMachineForTests, get_vm_boot_time diff --git a/tests/storage/test_cdi_certificate.py b/tests/storage/test_cdi_certificate.py index 5ad83f1cd0..10b05177c2 100644 --- a/tests/storage/test_cdi_certificate.py +++ b/tests/storage/test_cdi_certificate.py @@ -16,15 +16,10 @@ from pytest_testconfig import config as py_config from timeout_sampler import TimeoutSampler -from utilities.constants import ( - CDI_SECRETS, - QUARANTINED, - TIMEOUT_1MIN, - TIMEOUT_3MIN, - TIMEOUT_5SEC, - TIMEOUT_10MIN, - Images, -) +from utilities.constants import Images +from utilities.constants.pytest import QUARANTINED +from utilities.constants.storage import CDI_SECRETS +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_3MIN, TIMEOUT_5SEC, TIMEOUT_10MIN from utilities.hco import ResourceEditorValidateHCOReconcile from utilities.storage import ( check_upload_virtctl_result, diff --git a/tests/storage/test_cdi_resources.py b/tests/storage/test_cdi_resources.py index df7a165719..c41eea1410 100644 --- a/tests/storage/test_cdi_resources.py +++ b/tests/storage/test_cdi_resources.py @@ -18,18 +18,17 @@ from tests.storage.utils import import_image_to_dv, upload_image_to_dv from utilities.artifactory import get_test_artifact_server_url -from utilities.constants import ( - CDI_APISERVER, +from utilities.constants import Images +from utilities.constants.components import CDI_APISERVER, CDI_OPERATOR +from utilities.constants.storage import ( CDI_CONFIGMAPS, CDI_LABEL, - CDI_OPERATOR, CDI_SECRETS, CDI_UPLOAD, CDI_UPLOAD_TMP_PVC, SOURCE_POD, - TIMEOUT_10MIN, - Images, ) +from utilities.constants.timeouts import TIMEOUT_10MIN from utilities.storage import ( create_dv, data_volume, diff --git a/tests/storage/test_data_import_cron.py b/tests/storage/test_data_import_cron.py index 2318a3b43e..e16cabd7c0 100644 --- a/tests/storage/test_data_import_cron.py +++ b/tests/storage/test_data_import_cron.py @@ -15,15 +15,9 @@ from ocp_resources.volume_snapshot import VolumeSnapshot from timeout_sampler import TimeoutExpiredError, TimeoutSampler -from utilities.constants import ( - BIND_IMMEDIATE_ANNOTATION, - OUTDATED, - TIMEOUT_1MIN, - TIMEOUT_3MIN, - TIMEOUT_5SEC, - WILDCARD_CRON_EXPRESSION, - Images, -) +from utilities.constants import Images +from utilities.constants.storage import BIND_IMMEDIATE_ANNOTATION, OUTDATED, WILDCARD_CRON_EXPRESSION +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_3MIN, TIMEOUT_5SEC from utilities.storage import ( wait_for_succeeded_dv, wait_for_volume_snapshot_ready_to_use, diff --git a/tests/storage/test_hotplug.py b/tests/storage/test_hotplug.py index df54c3e11e..6ff7200d5c 100644 --- a/tests/storage/test_hotplug.py +++ b/tests/storage/test_hotplug.py @@ -15,7 +15,8 @@ from tests.storage.utils import assert_disk_bus from tests.utils import create_windows2022_dv_from_registry, create_windows2022_vm_with_vtpm_from_registry -from utilities.constants import HOTPLUG_DISK_SCSI_BUS, HOTPLUG_DISK_SERIAL, HOTPLUG_DISK_VIRTIO_BUS, Images +from utilities.constants import Images +from utilities.constants.storage import HOTPLUG_DISK_SCSI_BUS, HOTPLUG_DISK_SERIAL, HOTPLUG_DISK_VIRTIO_BUS from utilities.hco import ResourceEditorValidateHCOReconcile from utilities.jira import is_jira_open from utilities.storage import ( diff --git a/tests/storage/test_libguestfs.py b/tests/storage/test_libguestfs.py index 57ba960ce7..077766f193 100644 --- a/tests/storage/test_libguestfs.py +++ b/tests/storage/test_libguestfs.py @@ -11,7 +11,8 @@ from ocp_resources.pod import Pod from pytest_testconfig import config as py_config -from utilities.constants import TIMEOUT_1MIN, TIMEOUT_10MIN, UNPRIVILEGED_PASSWORD, UNPRIVILEGED_USER +from utilities.constants.pytest import UNPRIVILEGED_PASSWORD, UNPRIVILEGED_USER +from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_10MIN from utilities.infra import login_with_user_password from utilities.storage import create_dv, get_dv_size_from_datasource diff --git a/tests/storage/test_wffc.py b/tests/storage/test_wffc.py index 8ea6928f98..a3d6c5195f 100644 --- a/tests/storage/test_wffc.py +++ b/tests/storage/test_wffc.py @@ -9,12 +9,9 @@ from ocp_resources.persistent_volume_claim import PersistentVolumeClaim from ocp_resources.virtual_machine_instance import VirtualMachineInstance -from utilities.constants import ( - OS_FLAVOR_RHEL, - TIMEOUT_2MIN, - TIMEOUT_30SEC, - Images, -) +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_RHEL +from utilities.constants.timeouts import TIMEOUT_2MIN, TIMEOUT_30SEC from utilities.storage import ( add_dv_to_vm, check_disk_count_in_vm, diff --git a/tests/storage/upgrade/conftest.py b/tests/storage/upgrade/conftest.py index 8c1936e037..d6215b4f34 100644 --- a/tests/storage/upgrade/conftest.py +++ b/tests/storage/upgrade/conftest.py @@ -10,7 +10,7 @@ create_snapshot_for_upgrade, create_vm_for_snapshot_upgrade_tests, ) -from utilities.constants import HOTPLUG_DISK_SERIAL, HOTPLUG_DISK_VIRTIO_BUS +from utilities.constants.storage import HOTPLUG_DISK_SERIAL, HOTPLUG_DISK_VIRTIO_BUS from utilities.hco import ResourceEditorValidateHCOReconcile from utilities.storage import create_dv, virtctl_volume from utilities.virt import ( diff --git a/tests/storage/upgrade/test_upgrade_storage.py b/tests/storage/upgrade/test_upgrade_storage.py index 75be7573f5..5b46327434 100644 --- a/tests/storage/upgrade/test_upgrade_storage.py +++ b/tests/storage/upgrade/test_upgrade_storage.py @@ -15,7 +15,9 @@ SNAPSHOT_RESTORE_CREATE_AFTER_UPGRADE, STORAGE_NODE_ID_PREFIX, ) -from utilities.constants import DEPENDENCY_SCOPE_SESSION, HOTPLUG_DISK_VIRTIO_BUS, LS_COMMAND +from utilities.constants.cluster import LS_COMMAND +from utilities.constants.pytest import DEPENDENCY_SCOPE_SESSION +from utilities.constants.storage import HOTPLUG_DISK_VIRTIO_BUS from utilities.storage import ( assert_disk_serial, assert_hotplugvolume_nonexist, diff --git a/tests/storage/utils.py b/tests/storage/utils.py index 1be2a0deb2..2e73e6cac6 100644 --- a/tests/storage/utils.py +++ b/tests/storage/utils.py @@ -32,16 +32,10 @@ get_artifactory_secret, get_http_image_url, ) -from utilities.constants import ( - CDI_UPLOADPROXY, - LS_COMMAND, - TIMEOUT_2MIN, - TIMEOUT_5MIN, - TIMEOUT_5SEC, - TIMEOUT_20SEC, - TIMEOUT_30MIN, - Images, -) +from utilities.constants import Images +from utilities.constants.cluster import LS_COMMAND +from utilities.constants.components import CDI_UPLOADPROXY +from utilities.constants.timeouts import TIMEOUT_2MIN, TIMEOUT_5MIN, TIMEOUT_5SEC, TIMEOUT_20SEC, TIMEOUT_30MIN from utilities.exceptions import DataVolumeConditionMessageNotFoundError from utilities.infra import ( get_pod_by_name_prefix, diff --git a/tests/storage/vm_export/conftest.py b/tests/storage/vm_export/conftest.py index 97ca00769f..9da8bbe666 100644 --- a/tests/storage/vm_export/conftest.py +++ b/tests/storage/vm_export/conftest.py @@ -20,7 +20,9 @@ from tests.storage.constants import TEST_FILE_CONTENT, TEST_FILE_NAME from tests.storage.vm_export.utils import create_blank_dv_by_specific_user, get_manifest_from_vmexport, get_manifest_url -from utilities.constants import OS_FLAVOR_RHEL, U1_SMALL, UNPRIVILEGED_PASSWORD, UNPRIVILEGED_USER +from utilities.constants.images import OS_FLAVOR_RHEL +from utilities.constants.instance_types import U1_SMALL +from utilities.constants.pytest import UNPRIVILEGED_PASSWORD, UNPRIVILEGED_USER from utilities.infra import create_ns, login_with_user_password from utilities.storage import data_volume_template_with_source_ref_dict, write_file_via_ssh from utilities.virt import VirtualMachineForTests, running_vm diff --git a/tests/storage/vm_export/utils.py b/tests/storage/vm_export/utils.py index cceae57ed7..9755440ae0 100644 --- a/tests/storage/vm_export/utils.py +++ b/tests/storage/vm_export/utils.py @@ -15,7 +15,7 @@ from pyhelper_utils.shell import run_command from pytest_testconfig import config as py_config -from utilities.constants import TIMEOUT_1MIN +from utilities.constants.timeouts import TIMEOUT_1MIN from utilities.storage import create_dv LOGGER = logging.getLogger(__name__)