refactor(storage): migrate utilities.constants imports to submodules

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,

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

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"
 

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
 
 

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,

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

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

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,

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
 

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

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__)

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__)

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,

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

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"

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"

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,

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}"

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,

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

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

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

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
 

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
 

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,

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

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,

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__)

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__)