refactor(virt): migrate virt to direct constants submodule imports

tests/virt/cluster/aaq/conftest.py

@@ -23,15 +23,19 @@
 )
 from tests.virt.constants import ACRQ_NAMESPACE_LABEL, ACRQ_TEST
 from tests.virt.utils import update_hco_memory_overcommit, wait_for_virt_launcher_pod, wait_when_pod_in_gated_state
-from utilities.constants import (
+from utilities.constants import Images
+from utilities.constants.aaq import (
     AAQ_NAMESPACE_LABEL,
+    VM_CPU_CORES,
+    VM_MEMORY_GUEST,
+)
+from utilities.constants.networking import (
     POD_CONTAINER_SPEC,
     POD_SECURITY_CONTEXT_SPEC,
+)
+from utilities.constants.timeouts import (
     TIMEOUT_1MIN,
     TIMEOUT_5SEC,
-    VM_CPU_CORES,
-    VM_MEMORY_GUEST,
-    Images,
 )
 from utilities.hco import ResourceEditorValidateHCOReconcile, enabled_aaq_in_hco
 from utilities.infra import create_ns, get_pod_by_name_prefix, label_project

tests/virt/cluster/aaq/constants.py

@@ -1,4 +1,4 @@
-from utilities.constants import (
+from utilities.constants.aaq import (
     POD_LIMITS_CPU,
     POD_LIMITS_MEMORY,
     POD_REQUESTS_CPU,

tests/virt/cluster/aaq/test_arq.py

@@ -13,7 +13,7 @@
 )
 from tests.virt.cluster.aaq.utils import restart_vm_wait_for_gated_state
 from tests.virt.utils import check_arq_status_values, wait_when_pod_in_gated_state
-from utilities.constants import (
+from utilities.constants.aaq import (
     LIMITS_CPU_STR,
     LIMITS_MEMORY_STR,
     POD_LIMITS_CPU,

tests/virt/cluster/aaq/utils.py

@@ -7,10 +7,12 @@
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 from tests.virt.utils import check_arq_status_values, wait_for_virt_launcher_pod, wait_when_pod_in_gated_state
-from utilities.constants import (
+from utilities.constants.aaq import (
     AAQ_VIRTUAL_RESOURCES,
     AAQ_VMI_POD_USAGE,
     PODS_STR,
+)
+from utilities.constants.timeouts import (
     TIMEOUT_1MIN,
     TIMEOUT_5SEC,
 )

tests/virt/cluster/common_templates/centos/test_centos_os_support.py

@@ -17,7 +17,7 @@
     vm_os_version,
 )
 from utilities import console
-from utilities.constants import LINUX_STR
+from utilities.constants.instance_types import LINUX_STR
 from utilities.infra import validate_os_info_vmi_vs_linux_os
 from utilities.virt import (
     check_vm_xml_smbios,

tests/virt/cluster/common_templates/conftest.py

@@ -9,7 +9,7 @@
     xfail_old_guest_agent_version,
 )
 from tests.virt.utils import get_data_volume_template_dict_with_default_storage_class
-from utilities.constants import REGEDIT_PROC_NAME
+from utilities.constants.virt import REGEDIT_PROC_NAME
 from utilities.virt import (
     start_and_fetch_processid_on_linux_vm,
     start_and_fetch_processid_on_windows_vm,

tests/virt/cluster/common_templates/custom_namespace/conftest.py

@@ -12,7 +12,7 @@
     remove_templates,
     wait_for_ssp_custom_template_namespace,
 )
-from utilities.constants import NamespacesNames
+from utilities.constants.namespaces import NamespacesNames
 from utilities.hco import ResourceEditorValidateHCOReconcile
 from utilities.infra import create_ns
 

tests/virt/cluster/common_templates/custom_namespace/test_custom_namespace.py

@@ -12,7 +12,8 @@
     wait_for_edited_label_reconciliation,
     wait_for_template_by_name,
 )
-from utilities.constants import UNPRIVILEGED_USER, NamespacesNames
+from utilities.constants.namespaces import NamespacesNames
+from utilities.constants.pytest import UNPRIVILEGED_USER
 
 LOGGER = logging.getLogger(__name__)
 

tests/virt/cluster/common_templates/custom_namespace/utils.py

@@ -5,7 +5,11 @@
 from ocp_resources.template import Template
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
-from utilities.constants import TIMEOUT_1MIN, TIMEOUT_2MIN, TIMEOUT_3MIN
+from utilities.constants.timeouts import (
+    TIMEOUT_1MIN,
+    TIMEOUT_2MIN,
+    TIMEOUT_3MIN,
+)
 from utilities.hco import wait_for_hco_conditions
 from utilities.ssp import wait_for_ssp_conditions
 from utilities.virt import VirtualMachineForTestsFromTemplate, get_base_templates_list

tests/virt/cluster/common_templates/fedora/test_fedora_os_support.py

@@ -18,7 +18,7 @@
     vm_os_version,
 )
 from utilities import console
-from utilities.constants import LINUX_STR
+from utilities.constants.instance_types import LINUX_STR
 from utilities.guest_support import check_vm_xml_hyperv
 from utilities.infra import assert_secure_boot_mokutil_status, validate_os_info_vmi_vs_linux_os
 from utilities.virt import (

tests/virt/cluster/common_templates/general/test_base_custom_templates.py

@@ -5,7 +5,7 @@
 from ocp_resources.template import Template
 
 from tests.os_params import FEDORA_LATEST
-from utilities.constants import NamespacesNames
+from utilities.constants.namespaces import NamespacesNames
 from utilities.virt import (
     VirtualMachineForTestsFromTemplate,
     add_validation_rule_to_annotation,

tests/virt/cluster/common_templates/general/test_base_template.py

@@ -16,7 +16,12 @@
 from pytest_testconfig import config as py_config
 
 from tests.os_params import FEDORA_LATEST_LABELS
-from utilities.constants import DATA_SOURCE_NAME, DATA_SOURCE_NAMESPACE, HYPERV_FEATURES_LABELS_VM_YAML, Images
+from utilities.constants import Images
+from utilities.constants.hco import (
+    DATA_SOURCE_NAME,
+    DATA_SOURCE_NAMESPACE,
+)
+from utilities.constants.virt import HYPERV_FEATURES_LABELS_VM_YAML
 
 pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno]
 

tests/virt/cluster/common_templates/rhel/test_rhel_os_support.py

@@ -17,7 +17,7 @@
     vm_os_version,
 )
 from utilities import console
-from utilities.constants import LINUX_STR
+from utilities.constants.instance_types import LINUX_STR
 from utilities.infra import assert_secure_boot_mokutil_status, validate_os_info_vmi_vs_linux_os
 from utilities.virt import (
     assert_linux_efi,

tests/virt/cluster/common_templates/rhel/test_rhel_tablet_device.py

@@ -18,7 +18,7 @@
 
 from tests.os_params import FEDORA_LATEST, RHEL_LATEST, RHEL_LATEST_LABELS
 from tests.virt.cluster.common_templates.utils import check_vm_xml_tablet_device, set_vm_tablet_device_dict
-from utilities.constants import VIRTIO
+from utilities.constants.virt import VIRTIO
 from utilities.virt import VirtualMachineForTestsFromTemplate, migrate_vm_and_verify
 
 if TYPE_CHECKING:

tests/virt/cluster/common_templates/utils.py

@@ -17,9 +17,11 @@
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 from tests.virt.utils import get_or_create_golden_image_data_source
-from utilities.constants import (
+from utilities.constants.images import (
     OS_FLAVOR_RHEL,
     OS_FLAVOR_WINDOWS,
+)
+from utilities.constants.timeouts import (
     TCP_TIMEOUT_30SEC,
     TIMEOUT_1MIN,
     TIMEOUT_15SEC,

tests/virt/cluster/common_templates/windows/test_windows_custom_options.py

@@ -13,7 +13,13 @@
     WINDOWS_2019,
     WINDOWS_2019_OS,
 )
-from utilities.constants import LINUX_BRIDGE, TCP_TIMEOUT_30SEC, TIMEOUT_12MIN, VIRTIO, Images
+from utilities.constants import Images
+from utilities.constants.networking import LINUX_BRIDGE
+from utilities.constants.timeouts import (
+    TCP_TIMEOUT_30SEC,
+    TIMEOUT_12MIN,
+)
+from utilities.constants.virt import VIRTIO
 from utilities.network import network_device, network_nad
 from utilities.storage import get_storage_class_dict_from_matrix
 from utilities.virt import (

tests/virt/cluster/common_templates/windows/test_windows_os_support.py

@@ -16,7 +16,8 @@
     validate_user_info_virtctl_vs_windows_os,
 )
 from tests.virt.utils import validate_pause_unpause_windows_vm
-from utilities.constants import OS_FLAVOR_WINDOWS, QUARANTINED
+from utilities.constants.images import OS_FLAVOR_WINDOWS
+from utilities.constants.pytest import QUARANTINED
 from utilities.guest_support import assert_windows_efi, check_vm_xml_hyperv, check_windows_vm_hvinfo
 from utilities.ssp import validate_os_info_vmi_vs_windows_os
 from utilities.virt import (

tests/virt/cluster/common_templates/windows/test_windows_tablet_device.py

@@ -13,7 +13,8 @@
 
 from tests.os_params import WINDOWS_10, WINDOWS_LATEST, WINDOWS_LATEST_LABELS
 from tests.virt.cluster.common_templates.utils import check_vm_xml_tablet_device, set_vm_tablet_device_dict
-from utilities.constants import TCP_TIMEOUT_30SEC, VIRTIO
+from utilities.constants.timeouts import TCP_TIMEOUT_30SEC
+from utilities.constants.virt import VIRTIO
 
 pytestmark = [
     pytest.mark.special_infra,

tests/virt/cluster/general/mass_machine_type_transition_tests/conftest.py

@@ -6,7 +6,8 @@
 
 from tests.utils import get_image_from_csv
 from tests.virt.constants import MachineTypesNames
-from utilities.constants import TIMEOUT_2MIN, Images
+from utilities.constants import Images
+from utilities.constants.timeouts import TIMEOUT_2MIN
 from utilities.infra import add_scc_to_service_account, create_ns
 from utilities.virt import VirtualMachineForTests, restart_vm_wait_for_running_vm, wait_for_running_vm
 

tests/virt/cluster/longevity_tests/constants.py

@@ -1,7 +1,17 @@
 from ocp_resources.template import Template
 
 from tests.utils import generate_attached_rhsm_secret_dict, generate_rhsm_cloud_init_data
-from utilities.constants import AMD, INTEL, REGEDIT_PROC_NAME, WIN_10, WIN_11, Images, StorageClassNames
+from utilities.constants import Images
+from utilities.constants.architecture import (
+    AMD,
+    INTEL,
+)
+from utilities.constants.storage import StorageClassNames
+from utilities.constants.virt import (
+    REGEDIT_PROC_NAME,
+    WIN_10,
+    WIN_11,
+)
 from utilities.virt import (
     fetch_pid_from_linux_vm,
     fetch_pid_from_windows_vm,

tests/virt/cluster/longevity_tests/utils.py

@@ -24,7 +24,14 @@
     get_artifactory_config_map,
     get_artifactory_secret,
 )
-from utilities.constants import TCP_TIMEOUT_30SEC, TIMEOUT_5MIN, TIMEOUT_30MIN, TIMEOUT_40MIN, TIMEOUT_60MIN, WIN_10
+from utilities.constants.timeouts import (
+    TCP_TIMEOUT_30SEC,
+    TIMEOUT_5MIN,
+    TIMEOUT_30MIN,
+    TIMEOUT_40MIN,
+    TIMEOUT_60MIN,
+)
+from utilities.constants.virt import WIN_10
 from utilities.storage import get_test_artifact_server_url
 from utilities.virt import (
     VirtualMachineForTests,

tests/virt/cluster/migration_and_maintenance/rbac_hardening/test_migration_rights.py

@@ -3,7 +3,7 @@
 from ocp_resources.cluster_role import ClusterRole
 from ocp_resources.role_binding import RoleBinding
 
-from utilities.constants import UNPRIVILEGED_USER
+from utilities.constants.pytest import UNPRIVILEGED_USER
 from utilities.virt import VirtualMachineForTests, fedora_vm_body, migrate_vm_and_verify, running_vm
 
 pytestmark = pytest.mark.rwx_default_storage

tests/virt/cluster/migration_and_maintenance/test_evictionstrategy.py

@@ -6,12 +6,14 @@
 from timeout_sampler import TimeoutSampler
 
 from tests.os_params import RHEL_LATEST, RHEL_LATEST_LABELS
-from utilities.constants import (
-    EVICTIONSTRATEGY,
-    LIVE_MIGRATE,
+from utilities.constants.timeouts import (
     TIMEOUT_3MIN,
     TIMEOUT_5MIN,
 )
+from utilities.constants.virt import (
+    EVICTIONSTRATEGY,
+    LIVE_MIGRATE,
+)
 from utilities.hco import ResourceEditorValidateHCOReconcile
 from utilities.virt import (
     check_migration_process_after_node_drain,

tests/virt/cluster/migration_and_maintenance/test_migration_policy.py

@@ -6,7 +6,7 @@
 from ocp_resources.migration_policy import MigrationPolicy
 from ocp_resources.resource import ResourceEditor
 
-from utilities.constants import MIGRATION_POLICY_VM_LABEL
+from utilities.constants.virt import MIGRATION_POLICY_VM_LABEL
 from utilities.infra import label_project
 from utilities.virt import (
     VirtualMachineForTests,

tests/virt/cluster/operator_tests/test_critical_pods.py

@@ -8,7 +8,11 @@
 from ocp_resources.pod import Pod
 
 from tests.virt.cluster.utils import verify_pods_priority_class_value
-from utilities.constants import VIRT_API, VIRT_CONTROLLER, VIRT_HANDLER
+from utilities.constants.components import (
+    VIRT_API,
+    VIRT_CONTROLLER,
+    VIRT_HANDLER,
+)
 
 pytestmark = [
     pytest.mark.post_upgrade,

tests/virt/cluster/operator_tests/test_ssp_custom_resources.py

@@ -5,11 +5,11 @@
 from ocp_resources.pod import Pod
 
 from tests.virt.cluster.utils import verify_pods_priority_class_value
-from utilities.constants import (
-    DEFAULT_RESOURCE_CONDITIONS,
+from utilities.constants.components import (
     SSP_OPERATOR,
     VIRT_TEMPLATE_VALIDATOR,
 )
+from utilities.constants.hco import DEFAULT_RESOURCE_CONDITIONS
 from utilities.infra import get_pod_by_name_prefix
 
 LOGGER = logging.getLogger(__name__)

tests/virt/cluster/sysprep/test_sysprep.py

@@ -16,9 +16,14 @@
 from pyhelper_utils.shell import run_ssh_commands
 from timeout_sampler import TimeoutSampler
 
+from libs.infra.images import BASE_IMAGES_DIR
 from tests.os_params import WINDOWS_2019
 from utilities.bitwarden import get_cnv_tests_secret_by_name
-from utilities.constants import BASE_IMAGES_DIR, OS_FLAVOR_WINDOWS, TCP_TIMEOUT_30SEC, TIMEOUT_5MIN
+from utilities.constants.images import OS_FLAVOR_WINDOWS
+from utilities.constants.timeouts import (
+    TCP_TIMEOUT_30SEC,
+    TIMEOUT_5MIN,
+)
 from utilities.ssp import get_windows_timezone
 from utilities.storage import get_downloaded_artifact
 from utilities.virt import VirtualMachineForTests, migrate_vm_and_verify, running_vm

tests/virt/cluster/vm_cloning/conftest.py

@@ -6,12 +6,12 @@
     VirtualMachineClusterPreference,
 )
 
-from utilities.constants import (
-    OS_FLAVOR_RHEL,
+from utilities.constants import Images
+from utilities.constants.images import OS_FLAVOR_RHEL
+from utilities.constants.instance_types import (
     RHEL9_PREFERENCE,
     RHEL_WITH_INSTANCETYPE_AND_PREFERENCE,
     U1_SMALL,
-    Images,
 )
 from utilities.virt import (
     VirtualMachineForCloning,

tests/virt/cluster/vm_cloning/test_vm_cloning.py

@@ -18,7 +18,8 @@
     assert_target_vm_has_new_pvc_disks,
     check_if_files_present_after_cloning,
 )
-from utilities.constants import RHEL_WITH_INSTANCETYPE_AND_PREFERENCE, Images
+from utilities.constants import Images
+from utilities.constants.instance_types import RHEL_WITH_INSTANCETYPE_AND_PREFERENCE
 from utilities.storage import (
     add_dv_to_vm,
     check_disk_count_in_vm,

tests/virt/cluster/vm_cloning/utils.py

@@ -11,7 +11,10 @@
     SECOND_DISK_PATH,
     SECOND_DISK_TEST_FILE_STR,
 )
-from utilities.constants import TIMEOUT_1SEC, TIMEOUT_10SEC
+from utilities.constants.timeouts import (
+    TIMEOUT_1SEC,
+    TIMEOUT_10SEC,
+)
 
 if TYPE_CHECKING:
     from ocp_resources.virtual_machine import VirtualMachine

tests/virt/cluster/vm_lifecycle/test_vm_data_persistency.py

@@ -13,10 +13,12 @@
     WINDOWS_LATEST,
     WINDOWS_LATEST_LABELS,
 )
-from utilities.constants import (
-    LINUX_STR,
+from utilities.constants.images import (
     OS_FLAVOR_RHEL,
     OS_FLAVOR_WINDOWS,
+)
+from utilities.constants.instance_types import LINUX_STR
+from utilities.constants.timeouts import (
     TIMEOUT_2MIN,
     TIMEOUT_5MIN,
     TIMEOUT_30MIN,

tests/virt/cluster/vm_lifecycle/test_vm_run_strategy.py

@@ -16,7 +16,7 @@
 from timeout_sampler import TimeoutSampler
 
 from tests.os_params import RHEL_LATEST
-from utilities.constants import TIMEOUT_10MIN
+from utilities.constants.timeouts import TIMEOUT_10MIN
 from utilities.virt import migrate_vm_and_verify, running_vm
 
 if TYPE_CHECKING: