diff --git a/tests/virt/cluster/aaq/conftest.py b/tests/virt/cluster/aaq/conftest.py index 0cc21dd272..3a123441f3 100644 --- a/tests/virt/cluster/aaq/conftest.py +++ b/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 diff --git a/tests/virt/cluster/aaq/constants.py b/tests/virt/cluster/aaq/constants.py index c8a62da34e..41c9f89736 100644 --- a/tests/virt/cluster/aaq/constants.py +++ b/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, diff --git a/tests/virt/cluster/aaq/test_arq.py b/tests/virt/cluster/aaq/test_arq.py index e44e911bd5..4f97b4113c 100644 --- a/tests/virt/cluster/aaq/test_arq.py +++ b/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, diff --git a/tests/virt/cluster/aaq/utils.py b/tests/virt/cluster/aaq/utils.py index 495be94602..42c30288ff 100644 --- a/tests/virt/cluster/aaq/utils.py +++ b/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, ) diff --git a/tests/virt/cluster/common_templates/centos/test_centos_os_support.py b/tests/virt/cluster/common_templates/centos/test_centos_os_support.py index 33e01fac52..b684e11f75 100644 --- a/tests/virt/cluster/common_templates/centos/test_centos_os_support.py +++ b/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, diff --git a/tests/virt/cluster/common_templates/conftest.py b/tests/virt/cluster/common_templates/conftest.py index 2203fa6085..5e0a222415 100644 --- a/tests/virt/cluster/common_templates/conftest.py +++ b/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, diff --git a/tests/virt/cluster/common_templates/custom_namespace/conftest.py b/tests/virt/cluster/common_templates/custom_namespace/conftest.py index 14f7d1698b..55e9ad288a 100644 --- a/tests/virt/cluster/common_templates/custom_namespace/conftest.py +++ b/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 diff --git a/tests/virt/cluster/common_templates/custom_namespace/test_custom_namespace.py b/tests/virt/cluster/common_templates/custom_namespace/test_custom_namespace.py index 176d1c89af..d68a6b887f 100644 --- a/tests/virt/cluster/common_templates/custom_namespace/test_custom_namespace.py +++ b/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__) diff --git a/tests/virt/cluster/common_templates/custom_namespace/utils.py b/tests/virt/cluster/common_templates/custom_namespace/utils.py index 7cc69e2b86..e52e3f5426 100644 --- a/tests/virt/cluster/common_templates/custom_namespace/utils.py +++ b/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 diff --git a/tests/virt/cluster/common_templates/fedora/test_fedora_os_support.py b/tests/virt/cluster/common_templates/fedora/test_fedora_os_support.py index 71b2c2062c..e4997644d1 100644 --- a/tests/virt/cluster/common_templates/fedora/test_fedora_os_support.py +++ b/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 ( diff --git a/tests/virt/cluster/common_templates/general/test_base_custom_templates.py b/tests/virt/cluster/common_templates/general/test_base_custom_templates.py index 72b97bce18..7abc1eac32 100644 --- a/tests/virt/cluster/common_templates/general/test_base_custom_templates.py +++ b/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, diff --git a/tests/virt/cluster/common_templates/general/test_base_template.py b/tests/virt/cluster/common_templates/general/test_base_template.py index 87b92710f4..594f11387c 100644 --- a/tests/virt/cluster/common_templates/general/test_base_template.py +++ b/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] diff --git a/tests/virt/cluster/common_templates/rhel/test_rhel_os_support.py b/tests/virt/cluster/common_templates/rhel/test_rhel_os_support.py index fe2a480062..66285b2ec6 100644 --- a/tests/virt/cluster/common_templates/rhel/test_rhel_os_support.py +++ b/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, diff --git a/tests/virt/cluster/common_templates/rhel/test_rhel_tablet_device.py b/tests/virt/cluster/common_templates/rhel/test_rhel_tablet_device.py index 089ad976c9..2f8e66e941 100644 --- a/tests/virt/cluster/common_templates/rhel/test_rhel_tablet_device.py +++ b/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: diff --git a/tests/virt/cluster/common_templates/utils.py b/tests/virt/cluster/common_templates/utils.py index 4de38f0de3..5762a0ecc5 100644 --- a/tests/virt/cluster/common_templates/utils.py +++ b/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, diff --git a/tests/virt/cluster/common_templates/windows/test_windows_custom_options.py b/tests/virt/cluster/common_templates/windows/test_windows_custom_options.py index 38eac651be..f7228db2c5 100644 --- a/tests/virt/cluster/common_templates/windows/test_windows_custom_options.py +++ b/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 ( diff --git a/tests/virt/cluster/common_templates/windows/test_windows_os_support.py b/tests/virt/cluster/common_templates/windows/test_windows_os_support.py index 24bbc28216..5f534b7b28 100644 --- a/tests/virt/cluster/common_templates/windows/test_windows_os_support.py +++ b/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 ( diff --git a/tests/virt/cluster/common_templates/windows/test_windows_tablet_device.py b/tests/virt/cluster/common_templates/windows/test_windows_tablet_device.py index 625d2b4ae0..bd1f1c7086 100644 --- a/tests/virt/cluster/common_templates/windows/test_windows_tablet_device.py +++ b/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, diff --git a/tests/virt/cluster/general/mass_machine_type_transition_tests/conftest.py b/tests/virt/cluster/general/mass_machine_type_transition_tests/conftest.py index 7bf62efe80..bf54fdc196 100644 --- a/tests/virt/cluster/general/mass_machine_type_transition_tests/conftest.py +++ b/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 diff --git a/tests/virt/cluster/longevity_tests/constants.py b/tests/virt/cluster/longevity_tests/constants.py index 88e6ac4fb6..087a26f66c 100644 --- a/tests/virt/cluster/longevity_tests/constants.py +++ b/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, diff --git a/tests/virt/cluster/longevity_tests/utils.py b/tests/virt/cluster/longevity_tests/utils.py index 5ad02507da..83c7a95da3 100644 --- a/tests/virt/cluster/longevity_tests/utils.py +++ b/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, diff --git a/tests/virt/cluster/migration_and_maintenance/rbac_hardening/test_migration_rights.py b/tests/virt/cluster/migration_and_maintenance/rbac_hardening/test_migration_rights.py index caf4119271..2866f0486a 100644 --- a/tests/virt/cluster/migration_and_maintenance/rbac_hardening/test_migration_rights.py +++ b/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 diff --git a/tests/virt/cluster/migration_and_maintenance/test_evictionstrategy.py b/tests/virt/cluster/migration_and_maintenance/test_evictionstrategy.py index d368fda39a..a862143759 100644 --- a/tests/virt/cluster/migration_and_maintenance/test_evictionstrategy.py +++ b/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, diff --git a/tests/virt/cluster/migration_and_maintenance/test_migration_policy.py b/tests/virt/cluster/migration_and_maintenance/test_migration_policy.py index ca69cee072..efdfa1b1ab 100644 --- a/tests/virt/cluster/migration_and_maintenance/test_migration_policy.py +++ b/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, diff --git a/tests/virt/cluster/operator_tests/test_critical_pods.py b/tests/virt/cluster/operator_tests/test_critical_pods.py index 0dc89fd7fc..f6cf3cabba 100644 --- a/tests/virt/cluster/operator_tests/test_critical_pods.py +++ b/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, diff --git a/tests/virt/cluster/operator_tests/test_ssp_custom_resources.py b/tests/virt/cluster/operator_tests/test_ssp_custom_resources.py index b5e388f1e9..281108a4a5 100644 --- a/tests/virt/cluster/operator_tests/test_ssp_custom_resources.py +++ b/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__) diff --git a/tests/virt/cluster/sysprep/test_sysprep.py b/tests/virt/cluster/sysprep/test_sysprep.py index d1491fad02..fd483d1e11 100644 --- a/tests/virt/cluster/sysprep/test_sysprep.py +++ b/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 diff --git a/tests/virt/cluster/vm_cloning/conftest.py b/tests/virt/cluster/vm_cloning/conftest.py index b60f54450a..cf01d27efa 100644 --- a/tests/virt/cluster/vm_cloning/conftest.py +++ b/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, diff --git a/tests/virt/cluster/vm_cloning/test_vm_cloning.py b/tests/virt/cluster/vm_cloning/test_vm_cloning.py index 24c143a5ac..134b3e8560 100644 --- a/tests/virt/cluster/vm_cloning/test_vm_cloning.py +++ b/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, diff --git a/tests/virt/cluster/vm_cloning/utils.py b/tests/virt/cluster/vm_cloning/utils.py index 8156b627f7..0c8d16e0e1 100644 --- a/tests/virt/cluster/vm_cloning/utils.py +++ b/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 diff --git a/tests/virt/cluster/vm_lifecycle/test_vm_data_persistency.py b/tests/virt/cluster/vm_lifecycle/test_vm_data_persistency.py index 73cb3b8f4e..ba8f77f65a 100644 --- a/tests/virt/cluster/vm_lifecycle/test_vm_data_persistency.py +++ b/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, diff --git a/tests/virt/cluster/vm_lifecycle/test_vm_run_strategy.py b/tests/virt/cluster/vm_lifecycle/test_vm_run_strategy.py index f72235cd19..e94d01badb 100644 --- a/tests/virt/cluster/vm_lifecycle/test_vm_run_strategy.py +++ b/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: diff --git a/tests/virt/conftest.py b/tests/virt/conftest.py index 78d5f46f90..8807e334d6 100644 --- a/tests/virt/conftest.py +++ b/tests/virt/conftest.py @@ -38,12 +38,14 @@ patch_hco_cr_with_mdev_permitted_hostdevices, update_hco_memory_overcommit, ) -from utilities.constants import ( +from utilities.constants.architecture import ( AMD, INTEL, +) +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.timeouts import ( TIMEOUT_1MIN, TIMEOUT_5SEC, - NamespacesNames, ) from utilities.exceptions import ResourceValueError, UnsupportedGPUDeviceError from utilities.infra import ExecCommandOnPod, get_nodes_with_label, get_resources_by_name_prefix, label_nodes diff --git a/tests/virt/node/conftest.py b/tests/virt/node/conftest.py index a34c53f564..c2ebcec7f3 100644 --- a/tests/virt/node/conftest.py +++ b/tests/virt/node/conftest.py @@ -11,8 +11,8 @@ hotplug_spec_vm_and_verify_hotplug, ) from tests.virt.utils import append_feature_gate_to_hco -from utilities.constants import ( - AMD_64, +from utilities.constants.architecture import AMD_64 +from utilities.constants.virt import ( EIGHT_CPU_SOCKETS, FOUR_CPU_SOCKETS, FOUR_GI_MEMORY, diff --git a/tests/virt/node/descheduler/conftest.py b/tests/virt/node/descheduler/conftest.py index a74efff725..fb43950273 100644 --- a/tests/virt/node/descheduler/conftest.py +++ b/tests/virt/node/descheduler/conftest.py @@ -26,7 +26,11 @@ get_boot_time_for_multiple_vms, get_non_terminated_pods, ) -from utilities.constants import TIMEOUT_5MIN, TIMEOUT_5SEC, NamespacesNames +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.timeouts import ( + TIMEOUT_5MIN, + TIMEOUT_5SEC, +) from utilities.infra import wait_for_pods_deletion from utilities.virt import wait_for_migration_finished diff --git a/tests/virt/node/descheduler/test_descheduler_psi_metrics.py b/tests/virt/node/descheduler/test_descheduler_psi_metrics.py index b803ee29ca..0e9b0ecfc3 100644 --- a/tests/virt/node/descheduler/test_descheduler_psi_metrics.py +++ b/tests/virt/node/descheduler/test_descheduler_psi_metrics.py @@ -7,7 +7,7 @@ verify_at_least_one_vm_migrated, wait_for_overutilized_soft_taint, ) -from utilities.constants import TIMEOUT_15MIN +from utilities.constants.timeouts import TIMEOUT_15MIN LOGGER = logging.getLogger(__name__) diff --git a/tests/virt/node/descheduler/utils.py b/tests/virt/node/descheduler/utils.py index bada9fca51..16763295a7 100644 --- a/tests/virt/node/descheduler/utils.py +++ b/tests/virt/node/descheduler/utils.py @@ -14,13 +14,13 @@ DESCHEDULER_SOFT_TAINT_KEY, DESCHEDULING_INTERVAL_120SEC, ) -from utilities.constants import ( +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.timeouts import ( TIMEOUT_1MIN, TIMEOUT_5MIN, TIMEOUT_5SEC, TIMEOUT_10MIN, TIMEOUT_20SEC, - NamespacesNames, ) from utilities.virt import ( VirtualMachineForTests, diff --git a/tests/virt/node/general/test_cloud_init_disk_vm.py b/tests/virt/node/general/test_cloud_init_disk_vm.py index eb3810a6f7..f62f85f92f 100644 --- a/tests/virt/node/general/test_cloud_init_disk_vm.py +++ b/tests/virt/node/general/test_cloud_init_disk_vm.py @@ -1,6 +1,6 @@ import pytest -from utilities.constants import CLOUD_INIT_NO_CLOUD +from utilities.constants.virt import CLOUD_INIT_NO_CLOUD from utilities.virt import VirtualMachineForTests, fedora_vm_body, running_vm diff --git a/tests/virt/node/general/test_cloud_init_vm.py b/tests/virt/node/general/test_cloud_init_vm.py index 20a3383865..77746f2d69 100644 --- a/tests/virt/node/general/test_cloud_init_vm.py +++ b/tests/virt/node/general/test_cloud_init_vm.py @@ -4,7 +4,7 @@ import pytest -from utilities.constants import CLOUD_INIT_NO_CLOUD +from utilities.constants.virt import CLOUD_INIT_NO_CLOUD from utilities.virt import VirtualMachineForTests, fedora_vm_body, running_vm pytestmark = [pytest.mark.post_upgrade, pytest.mark.arm64] diff --git a/tests/virt/node/general/test_disk_io_option.py b/tests/virt/node/general/test_disk_io_option.py index 8fe0759f07..622b4f41cf 100644 --- a/tests/virt/node/general/test_disk_io_option.py +++ b/tests/virt/node/general/test_disk_io_option.py @@ -8,7 +8,7 @@ WINDOWS_LATEST, WINDOWS_LATEST_LABELS, ) -from utilities.constants import ROOTDISK +from utilities.constants.virt import ROOTDISK from utilities.virt import get_guest_os_info, vm_instance_from_template pytestmark = pytest.mark.usefixtures("skip_test_if_no_ocs_sc") diff --git a/tests/virt/node/general/test_machinetype.py b/tests/virt/node/general/test_machinetype.py index 31b8ffe970..44af0a7e24 100644 --- a/tests/virt/node/general/test_machinetype.py +++ b/tests/virt/node/general/test_machinetype.py @@ -10,7 +10,7 @@ from tests.virt.constants import MachineTypesNames from tests.virt.utils import get_data_volume_template_dict_with_default_storage_class, validate_machine_type -from utilities.constants import ( +from utilities.constants.instance_types import ( FLAVOR_STR, OS_STR, WORKLOAD_STR, diff --git a/tests/virt/node/general/test_networkinterfacemultiqueue_feature.py b/tests/virt/node/general/test_networkinterfacemultiqueue_feature.py index 1f93f3ab02..3746442388 100644 --- a/tests/virt/node/general/test_networkinterfacemultiqueue_feature.py +++ b/tests/virt/node/general/test_networkinterfacemultiqueue_feature.py @@ -13,7 +13,8 @@ WINDOWS_2019_OS, WINDOWS_2019_TEMPLATE_LABELS, ) -from utilities.constants import TIMEOUT_2MIN, VIRTIO +from utilities.constants.timeouts import TIMEOUT_2MIN +from utilities.constants.virt import VIRTIO from utilities.virt import restart_vm_wait_for_running_vm, vm_instance_from_template RHEL_TESTS_CLASS_NAME = "TestLatestRHEL" diff --git a/tests/virt/node/general/test_oom.py b/tests/virt/node/general/test_oom.py index 07f0ca93d5..fe5d0cbb76 100644 --- a/tests/virt/node/general/test_oom.py +++ b/tests/virt/node/general/test_oom.py @@ -15,7 +15,12 @@ from tests.os_params import WINDOWS_10_TEMPLATE_LABELS from tests.utils import start_stress_on_vm from tests.virt.constants import WINDOWS_10_WSL -from utilities.constants import STRESS_CPU_MEM_IO_COMMAND, TCP_TIMEOUT_30SEC, TIMEOUT_15MIN, Images +from utilities.constants import Images +from utilities.constants.timeouts import ( + TCP_TIMEOUT_30SEC, + TIMEOUT_15MIN, +) +from utilities.constants.virt import STRESS_CPU_MEM_IO_COMMAND from utilities.virt import VirtualMachineForTests, fedora_vm_body, running_vm pytestmark = pytest.mark.tier3 diff --git a/tests/virt/node/general/test_static_ssh_key_injection.py b/tests/virt/node/general/test_static_ssh_key_injection.py index 841dffb8c0..caefaa4921 100644 --- a/tests/virt/node/general/test_static_ssh_key_injection.py +++ b/tests/virt/node/general/test_static_ssh_key_injection.py @@ -9,7 +9,11 @@ from ocp_resources.secret import Secret from tests.os_params import RHEL_LATEST -from utilities.constants import CLOUD_INIT_NO_CLOUD, CNV_VM_SSH_KEY_PATH, OS_FLAVOR_RHEL +from utilities.constants.images import OS_FLAVOR_RHEL +from utilities.constants.virt import ( + CLOUD_INIT_NO_CLOUD, + CNV_VM_SSH_KEY_PATH, +) from utilities.data_utils import authorized_key, base64_encode_str from utilities.virt import VirtualMachineForTests, running_vm diff --git a/tests/virt/node/general/test_windows_vtpm_bitlocker.py b/tests/virt/node/general/test_windows_vtpm_bitlocker.py index b7a4211725..96d5e6fe0f 100644 --- a/tests/virt/node/general/test_windows_vtpm_bitlocker.py +++ b/tests/virt/node/general/test_windows_vtpm_bitlocker.py @@ -12,7 +12,10 @@ from tests.os_params import WINDOWS_11, WINDOWS_2022 from tests.utils import update_hco_with_persistent_storage_config -from utilities.constants import TIMEOUT_2MIN, TIMEOUT_40MIN +from utilities.constants.timeouts import ( + TIMEOUT_2MIN, + TIMEOUT_40MIN, +) from utilities.virt import ( VirtualMachineForTestsFromTemplate, get_windows_os_dict, diff --git a/tests/virt/node/general/test_wsl2.py b/tests/virt/node/general/test_wsl2.py index 91d33aa613..2678f87916 100644 --- a/tests/virt/node/general/test_wsl2.py +++ b/tests/virt/node/general/test_wsl2.py @@ -18,7 +18,9 @@ from tests.utils import verify_wsl2_guest_works from tests.virt.constants import WINDOWS_10_WSL, WINDOWS_11_WSL -from utilities.constants import OS_FLAVOR_WINDOWS, TCP_TIMEOUT_30SEC, Images +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_WINDOWS +from utilities.constants.timeouts import TCP_TIMEOUT_30SEC from utilities.virt import ( VirtualMachineForTests, migrate_vm_and_verify, diff --git a/tests/virt/node/gpu/conftest.py b/tests/virt/node/gpu/conftest.py index 21537506a9..2c4a47120f 100644 --- a/tests/virt/node/gpu/conftest.py +++ b/tests/virt/node/gpu/conftest.py @@ -6,7 +6,7 @@ from tests.virt.node.gpu.utils import install_nvidia_drivers_on_windows_vm from tests.virt.utils import build_node_affinity_dict -from utilities.constants import OS_FLAVOR_WINDOWS +from utilities.constants.images import OS_FLAVOR_WINDOWS from utilities.virt import vm_instance_from_template diff --git a/tests/virt/node/gpu/gpu_pci_passthrough/conftest.py b/tests/virt/node/gpu/gpu_pci_passthrough/conftest.py index 2e3f41eae8..01afe655b6 100644 --- a/tests/virt/node/gpu/gpu_pci_passthrough/conftest.py +++ b/tests/virt/node/gpu/gpu_pci_passthrough/conftest.py @@ -15,7 +15,12 @@ NVIDIA_VFIO_MANAGER_DS, ) from tests.virt.node.gpu.utils import wait_for_ds_ready -from utilities.constants import KERNEL_DRIVER, TIMEOUT_1MIN, TIMEOUT_5SEC, NamespacesNames +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.timeouts import ( + TIMEOUT_1MIN, + TIMEOUT_5SEC, +) +from utilities.constants.virt import KERNEL_DRIVER from utilities.hco import ResourceEditorValidateHCOReconcile from utilities.infra import label_nodes from utilities.virt import get_nodes_gpu_info diff --git a/tests/virt/node/gpu/gpu_pci_passthrough/test_rhel_vm_with_gpu_pci_passthrough.py b/tests/virt/node/gpu/gpu_pci_passthrough/test_rhel_vm_with_gpu_pci_passthrough.py index 2f72f634a8..8cdd8b9f83 100644 --- a/tests/virt/node/gpu/gpu_pci_passthrough/test_rhel_vm_with_gpu_pci_passthrough.py +++ b/tests/virt/node/gpu/gpu_pci_passthrough/test_rhel_vm_with_gpu_pci_passthrough.py @@ -19,7 +19,7 @@ verify_gpu_device_exists_in_vm, verify_gpu_device_exists_on_node, ) -from utilities.constants import TIMEOUT_5SEC +from utilities.constants.timeouts import TIMEOUT_5SEC from utilities.virt import ( CIRROS_IMAGE, VirtualMachineForTests, diff --git a/tests/virt/node/gpu/utils.py b/tests/virt/node/gpu/utils.py index 60f1f905ba..01823f11e7 100644 --- a/tests/virt/node/gpu/utils.py +++ b/tests/virt/node/gpu/utils.py @@ -11,7 +11,7 @@ VGPU_DEVICE_NAME_STR, ) from tests.virt.utils import fetch_gpu_device_name_from_vm_instance, verify_gpu_device_exists_in_vm -from utilities.constants import ( +from utilities.constants.timeouts import ( TCP_TIMEOUT_30SEC, TIMEOUT_2MIN, TIMEOUT_3MIN, diff --git a/tests/virt/node/high_performance_vm/test_numa.py b/tests/virt/node/high_performance_vm/test_numa.py index cb7dfbf868..0387e2d53b 100644 --- a/tests/virt/node/high_performance_vm/test_numa.py +++ b/tests/virt/node/high_performance_vm/test_numa.py @@ -10,7 +10,7 @@ get_numa_node_cpu_dict, get_vm_cpu_list, ) -from utilities.constants import SRIOV +from utilities.constants.networking import SRIOV from utilities.infra import ExecCommandOnPod from utilities.network import sriov_network_dict from utilities.virt import VirtualMachineForTests, fedora_vm_body diff --git a/tests/virt/node/hotplug/test_cpu_memory_hotplug.py b/tests/virt/node/hotplug/test_cpu_memory_hotplug.py index 7f677238b4..07d2c8e36f 100644 --- a/tests/virt/node/hotplug/test_cpu_memory_hotplug.py +++ b/tests/virt/node/hotplug/test_cpu_memory_hotplug.py @@ -14,7 +14,7 @@ hotplug_spec_vm, wait_for_guest_os_cpu_count, ) -from utilities.constants import ( +from utilities.constants.virt import ( FIVE_GI_MEMORY, FOUR_CPU_SOCKETS, FOUR_GI_MEMORY, diff --git a/tests/virt/node/hyperv_support/test_hyperv_features_in_vm.py b/tests/virt/node/hyperv_support/test_hyperv_features_in_vm.py index 64463bcda2..0ea30ddb2e 100644 --- a/tests/virt/node/hyperv_support/test_hyperv_features_in_vm.py +++ b/tests/virt/node/hyperv_support/test_hyperv_features_in_vm.py @@ -8,7 +8,7 @@ WINDOWS_LATEST, WINDOWS_LATEST_LABELS, ) -from utilities.constants import VIRT_LAUNCHER +from utilities.constants.components import VIRT_LAUNCHER from utilities.virt import vm_instance_from_template LOGGER = logging.getLogger(__name__) diff --git a/tests/virt/node/hyperv_support/test_windows_crash_detection.py b/tests/virt/node/hyperv_support/test_windows_crash_detection.py index 23a547b407..a38eddd535 100644 --- a/tests/virt/node/hyperv_support/test_windows_crash_detection.py +++ b/tests/virt/node/hyperv_support/test_windows_crash_detection.py @@ -12,7 +12,7 @@ from timeout_sampler import TimeoutExpiredError from tests.os_params import WINDOWS_LATEST, WINDOWS_LATEST_LABELS -from utilities.constants import TIMEOUT_10SEC +from utilities.constants.timeouts import TIMEOUT_10SEC from utilities.data_collector import collect_vnc_screenshot_for_vms from utilities.virt import running_vm, vm_instance_from_template diff --git a/tests/virt/node/log_verbosity/test_log_verbosity.py b/tests/virt/node/log_verbosity/test_log_verbosity.py index 66525d6294..e10f57933a 100644 --- a/tests/virt/node/log_verbosity/test_log_verbosity.py +++ b/tests/virt/node/log_verbosity/test_log_verbosity.py @@ -10,7 +10,11 @@ from tests.virt.node.log_verbosity.constants import ( VIRT_LOG_VERBOSITY_LEVEL_6, ) -from utilities.constants import VIRT_API, VIRT_CONTROLLER, VIRT_HANDLER +from utilities.constants.components import ( + VIRT_API, + VIRT_CONTROLLER, + VIRT_HANDLER, +) from utilities.infra import get_pods LOGGER = logging.getLogger(__name__) diff --git a/tests/virt/node/log_verbosity/test_log_virt_launcher.py b/tests/virt/node/log_verbosity/test_log_virt_launcher.py index 71fb567946..cefba60493 100644 --- a/tests/virt/node/log_verbosity/test_log_virt_launcher.py +++ b/tests/virt/node/log_verbosity/test_log_virt_launcher.py @@ -10,7 +10,11 @@ from tests.virt.node.log_verbosity.constants import ( VIRT_LOG_VERBOSITY_LEVEL_6, ) -from utilities.constants import MIGRATION_POLICY_VM_LABEL, TIMEOUT_1MIN, TIMEOUT_5SEC +from utilities.constants.timeouts import ( + TIMEOUT_1MIN, + TIMEOUT_5SEC, +) +from utilities.constants.virt import MIGRATION_POLICY_VM_LABEL from utilities.virt import ( VirtualMachineForTests, fedora_vm_body, diff --git a/tests/virt/node/migration_and_maintenance/test_node_maintenance.py b/tests/virt/node/migration_and_maintenance/test_node_maintenance.py index a42337c2ff..f0bcf573e2 100644 --- a/tests/virt/node/migration_and_maintenance/test_node_maintenance.py +++ b/tests/virt/node/migration_and_maintenance/test_node_maintenance.py @@ -17,7 +17,8 @@ WINDOWS_LATEST_LABELS, ) from tests.virt.utils import running_sleep_in_linux -from utilities.constants import OS_PROC_NAME, TIMEOUT_30SEC +from utilities.constants.timeouts import TIMEOUT_30SEC +from utilities.constants.virt import OS_PROC_NAME from utilities.virt import ( VirtualMachineForTests, check_migration_process_after_node_drain, diff --git a/tests/virt/node/migration_and_maintenance/test_odf_vm_migration.py b/tests/virt/node/migration_and_maintenance/test_odf_vm_migration.py index 918f6b959f..91368a3f00 100644 --- a/tests/virt/node/migration_and_maintenance/test_odf_vm_migration.py +++ b/tests/virt/node/migration_and_maintenance/test_odf_vm_migration.py @@ -5,7 +5,7 @@ import pytest from tests.os_params import FEDORA_LATEST, FEDORA_LATEST_LABELS -from utilities.constants import StorageClassNames +from utilities.constants.storage import StorageClassNames from utilities.storage import data_volume_template_with_source_ref_dict from utilities.virt import migrate_vm_and_verify, vm_instance_from_template diff --git a/tests/virt/node/migration_and_maintenance/test_post_copy_migration.py b/tests/virt/node/migration_and_maintenance/test_post_copy_migration.py index 18b227689f..90bc5e29f5 100644 --- a/tests/virt/node/migration_and_maintenance/test_post_copy_migration.py +++ b/tests/virt/node/migration_and_maintenance/test_post_copy_migration.py @@ -14,12 +14,14 @@ ) from tests.virt.constants import VM_LABEL from tests.virt.utils import assert_migration_post_copy_mode -from utilities.constants import ( +from utilities.constants.timeouts import ( + TIMEOUT_15MIN, + TIMEOUT_30MIN, +) +from utilities.constants.virt import ( REGEDIT_PROC_NAME, SIX_CPU_SOCKETS, SIX_GI_MEMORY, - TIMEOUT_15MIN, - TIMEOUT_30MIN, ) from utilities.virt import ( check_migration_process_after_node_drain, diff --git a/tests/virt/node/migration_and_maintenance/test_vm_disk_load_with_migration.py b/tests/virt/node/migration_and_maintenance/test_vm_disk_load_with_migration.py index b755dfa72d..48ba2721b7 100644 --- a/tests/virt/node/migration_and_maintenance/test_vm_disk_load_with_migration.py +++ b/tests/virt/node/migration_and_maintenance/test_vm_disk_load_with_migration.py @@ -10,7 +10,7 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler from tests.os_params import FEDORA_LATEST, FEDORA_LATEST_LABELS -from utilities.constants import TIMEOUT_1MIN +from utilities.constants.timeouts import TIMEOUT_1MIN from utilities.virt import migrate_vm_and_verify, running_vm, vm_instance_from_template if TYPE_CHECKING: diff --git a/tests/virt/node/migration_and_maintenance/test_vm_memory_load_with_migration.py b/tests/virt/node/migration_and_maintenance/test_vm_memory_load_with_migration.py index 4c4ab85b9d..2675e389b2 100644 --- a/tests/virt/node/migration_and_maintenance/test_vm_memory_load_with_migration.py +++ b/tests/virt/node/migration_and_maintenance/test_vm_memory_load_with_migration.py @@ -13,7 +13,9 @@ from tests.utils import start_stress_on_vm from tests.virt.constants import WINDOWS_10_WSL from tests.virt.utils import get_stress_ng_pid, verify_stress_ng_pid_not_changed -from utilities.constants import STRESS_CPU_MEM_IO_COMMAND, TIMEOUT_20MIN, Images +from utilities.constants import Images +from utilities.constants.timeouts import TIMEOUT_20MIN +from utilities.constants.virt import STRESS_CPU_MEM_IO_COMMAND from utilities.virt import migrate_vm_and_verify if TYPE_CHECKING: diff --git a/tests/virt/node/node_labeller/cpu_features/test_node_feature_discovery.py b/tests/virt/node/node_labeller/cpu_features/test_node_feature_discovery.py index f1730645e1..1e51cc6c96 100644 --- a/tests/virt/node/node_labeller/cpu_features/test_node_feature_discovery.py +++ b/tests/virt/node/node_labeller/cpu_features/test_node_feature_discovery.py @@ -4,7 +4,7 @@ import pytest -from utilities.constants import CPU_MODEL_LABEL_PREFIX +from utilities.constants.cluster import CPU_MODEL_LABEL_PREFIX from utilities.hco import update_hco_annotations from utilities.virt import wait_for_kv_stabilize, wait_for_updated_kv_value diff --git a/tests/virt/node/node_labeller/cpu_features/test_vm_with_cpu_features.py b/tests/virt/node/node_labeller/cpu_features/test_vm_with_cpu_features.py index 2a249eee6e..c22b0078b9 100644 --- a/tests/virt/node/node_labeller/cpu_features/test_vm_with_cpu_features.py +++ b/tests/virt/node/node_labeller/cpu_features/test_vm_with_cpu_features.py @@ -5,7 +5,7 @@ import pytest from kubernetes.dynamic.exceptions import UnprocessibleEntityError -from utilities.constants import AMD +from utilities.constants.architecture import AMD from utilities.virt import VirtualMachineForTests, fedora_vm_body, running_vm pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.usefixtures("fail_if_amd_cpu_nodes")] diff --git a/tests/virt/node/node_labeller/cpu_features/test_vm_with_cpu_flag.py b/tests/virt/node/node_labeller/cpu_features/test_vm_with_cpu_flag.py index fe605b5906..2bedb8a4ff 100644 --- a/tests/virt/node/node_labeller/cpu_features/test_vm_with_cpu_flag.py +++ b/tests/virt/node/node_labeller/cpu_features/test_vm_with_cpu_flag.py @@ -5,7 +5,7 @@ import pytest from timeout_sampler import TimeoutExpiredError -from utilities.constants import TIMEOUT_1MIN +from utilities.constants.timeouts import TIMEOUT_1MIN from utilities.virt import VirtualMachineForTests, fedora_vm_body, running_vm pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno] diff --git a/tests/virt/node/node_labeller/test_node_labeller_annotation.py b/tests/virt/node/node_labeller/test_node_labeller_annotation.py index e23bcb6dfe..81fe414a96 100644 --- a/tests/virt/node/node_labeller/test_node_labeller_annotation.py +++ b/tests/virt/node/node_labeller/test_node_labeller_annotation.py @@ -4,7 +4,11 @@ from ocp_resources.resource import ResourceEditor from timeout_sampler import TimeoutExpiredError, TimeoutSampler -from utilities.constants import CPU_MODEL_LABEL_PREFIX, TIMEOUT_5SEC, TIMEOUT_10MIN +from utilities.constants.cluster import CPU_MODEL_LABEL_PREFIX +from utilities.constants.timeouts import ( + TIMEOUT_5SEC, + TIMEOUT_10MIN, +) from utilities.exceptions import ResourceValueError, raise_multiple_exceptions LOGGER = logging.getLogger(__name__) diff --git a/tests/virt/node/readonly_disk/test_vm_with_windows_guest_tools.py b/tests/virt/node/readonly_disk/test_vm_with_windows_guest_tools.py index 20d84c7b4e..4cbaa091e0 100644 --- a/tests/virt/node/readonly_disk/test_vm_with_windows_guest_tools.py +++ b/tests/virt/node/readonly_disk/test_vm_with_windows_guest_tools.py @@ -13,7 +13,9 @@ ) from tests.os_params import WINDOWS_10 -from utilities.constants import OS_FLAVOR_WINDOWS, TIMEOUT_3MIN, VIRTIO_WIN +from utilities.constants.components import VIRTIO_WIN +from utilities.constants.images import OS_FLAVOR_WINDOWS +from utilities.constants.timeouts import TIMEOUT_3MIN from utilities.virt import VirtualMachineForTests, migrate_vm_and_verify, running_vm if TYPE_CHECKING: diff --git a/tests/virt/node/workload_density/test_kernel_samepage_merging.py b/tests/virt/node/workload_density/test_kernel_samepage_merging.py index 5104fbc12c..64da217794 100644 --- a/tests/virt/node/workload_density/test_kernel_samepage_merging.py +++ b/tests/virt/node/workload_density/test_kernel_samepage_merging.py @@ -9,7 +9,10 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler from tests.utils import create_vms -from utilities.constants import TIMEOUT_5MIN, TIMEOUT_30SEC +from utilities.constants.timeouts import ( + TIMEOUT_5MIN, + TIMEOUT_30SEC, +) from utilities.hco import ResourceEditorValidateHCOReconcile from utilities.infra import ExecCommandOnPod, label_nodes from utilities.virt import migrate_vm_and_verify, running_vm diff --git a/tests/virt/node/workload_density/test_swap.py b/tests/virt/node/workload_density/test_swap.py index c29eeb240f..65ad261331 100644 --- a/tests/virt/node/workload_density/test_swap.py +++ b/tests/virt/node/workload_density/test_swap.py @@ -12,7 +12,12 @@ from tests.utils import start_stress_on_vm from tests.virt.constants import REMOVE_NEWLINE from tests.virt.utils import build_node_affinity_dict -from utilities.constants import TIMEOUT_5MIN, TIMEOUT_5SEC, TIMEOUT_20MIN, Images +from utilities.constants import Images +from utilities.constants.timeouts import ( + TIMEOUT_5MIN, + TIMEOUT_5SEC, + TIMEOUT_20MIN, +) from utilities.infra import ExecCommandOnPod from utilities.virt import VirtualMachineForTests, migrate_vm_and_verify, running_vm diff --git a/tests/virt/upgrade/conftest.py b/tests/virt/upgrade/conftest.py index 2f5250b4c6..dd9cc05b5a 100644 --- a/tests/virt/upgrade/conftest.py +++ b/tests/virt/upgrade/conftest.py @@ -21,13 +21,13 @@ ) from tests.virt.utils import get_boot_time_for_multiple_vms from utilities.artifactory import get_test_artifact_server_url -from utilities.constants import ( - ES_LIVE_MIGRATE_IF_POSSIBLE, - OS_FLAVOR_RHEL, +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_RHEL +from utilities.constants.timeouts import ( TIMEOUT_30MIN, TIMEOUT_40MIN, - Images, ) +from utilities.constants.virt import ES_LIVE_MIGRATE_IF_POSSIBLE from utilities.hco import ResourceEditorValidateHCOReconcile from utilities.infra import create_ns, get_csv_by_name from utilities.storage import ( diff --git a/tests/virt/upgrade/test_upgrade_virt.py b/tests/virt/upgrade/test_upgrade_virt.py index d993964a79..af74c6f482 100644 --- a/tests/virt/upgrade/test_upgrade_virt.py +++ b/tests/virt/upgrade/test_upgrade_virt.py @@ -22,7 +22,8 @@ verify_vms_ssh_connectivity, ) from tests.virt.utils import assert_migration_post_copy_mode, verify_guest_boot_time -from utilities.constants import DATA_SOURCE_NAME, DEPENDENCY_SCOPE_SESSION +from utilities.constants.hco import DATA_SOURCE_NAME +from utilities.constants.pytest import DEPENDENCY_SCOPE_SESSION from utilities.exceptions import ResourceValueError from utilities.virt import migrate_vm_and_verify, vm_console_run_commands diff --git a/tests/virt/upgrade/utils.py b/tests/virt/upgrade/utils.py index c4fc969de6..1b282e12c5 100644 --- a/tests/virt/upgrade/utils.py +++ b/tests/virt/upgrade/utils.py @@ -16,12 +16,12 @@ ) from timeout_sampler import TimeoutExpiredError, TimeoutSampler -from utilities.constants import ( - DATA_SOURCE_NAME, +from utilities.constants.components import VIRT_LAUNCHER +from utilities.constants.hco import DATA_SOURCE_NAME +from utilities.constants.timeouts import ( TIMEOUT_3MIN, TIMEOUT_10SEC, TIMEOUT_180MIN, - VIRT_LAUNCHER, ) from utilities.exceptions import ResourceMissingFieldError from utilities.virt import ( diff --git a/tests/virt/upgrade_custom/aaq/conftest.py b/tests/virt/upgrade_custom/aaq/conftest.py index 2513a9c533..76ee0be097 100644 --- a/tests/virt/upgrade_custom/aaq/conftest.py +++ b/tests/virt/upgrade_custom/aaq/conftest.py @@ -6,7 +6,7 @@ from tests.virt.constants import ACRQ_NAMESPACE_LABEL from tests.virt.upgrade_custom.aaq.constants import UPGRADE_QUOTA_FOR_ONE_VMI from tests.virt.utils import wait_for_virt_launcher_pod, wait_when_pod_in_gated_state -from utilities.constants import AAQ_NAMESPACE_LABEL +from utilities.constants.aaq import AAQ_NAMESPACE_LABEL from utilities.hco import enabled_aaq_in_hco from utilities.infra import ( create_ns, diff --git a/tests/virt/upgrade_custom/aaq/constants.py b/tests/virt/upgrade_custom/aaq/constants.py index 23b7be5b52..0a75b2d848 100644 --- a/tests/virt/upgrade_custom/aaq/constants.py +++ b/tests/virt/upgrade_custom/aaq/constants.py @@ -1,4 +1,8 @@ -from utilities.constants import REQUESTS_CPU_VMI_STR, REQUESTS_INSTANCES_VMI_STR, REQUESTS_MEMORY_VMI_STR +from utilities.constants.aaq import ( + REQUESTS_CPU_VMI_STR, + REQUESTS_INSTANCES_VMI_STR, + REQUESTS_MEMORY_VMI_STR, +) UPGRADE_QUOTA_FOR_ONE_VMI = { REQUESTS_INSTANCES_VMI_STR: "1", diff --git a/tests/virt/upgrade_custom/aaq/test_upgrade_virt_aaq.py b/tests/virt/upgrade_custom/aaq/test_upgrade_virt_aaq.py index b58a6efa10..bf8ce04dc8 100644 --- a/tests/virt/upgrade_custom/aaq/test_upgrade_virt_aaq.py +++ b/tests/virt/upgrade_custom/aaq/test_upgrade_virt_aaq.py @@ -10,7 +10,7 @@ ) from tests.virt.upgrade_custom.aaq.constants import UPGRADE_QUOTA_FOR_ONE_VMI from tests.virt.utils import check_arq_status_values, check_pod_in_gated_state -from utilities.constants import DEPENDENCY_SCOPE_SESSION +from utilities.constants.pytest import DEPENDENCY_SCOPE_SESSION LOGGER = logging.getLogger(__name__) diff --git a/tests/virt/upgrade_custom/vgpu/conftest.py b/tests/virt/upgrade_custom/vgpu/conftest.py index ed0df2fb42..9737d6353e 100644 --- a/tests/virt/upgrade_custom/vgpu/conftest.py +++ b/tests/virt/upgrade_custom/vgpu/conftest.py @@ -9,7 +9,8 @@ from tests.virt.upgrade.utils import vm_from_template from tests.virt.utils import build_node_affinity_dict, verify_gpu_device_exists_on_node from utilities.artifactory import get_test_artifact_server_url -from utilities.constants import ES_NONE, TIMEOUT_30MIN +from utilities.constants.timeouts import TIMEOUT_30MIN +from utilities.constants.virt import ES_NONE from utilities.storage import ( create_dv, generate_data_source_dict, diff --git a/tests/virt/utils.py b/tests/virt/utils.py index 3582bbac6d..2506e385fd 100644 --- a/tests/virt/utils.py +++ b/tests/virt/utils.py @@ -25,11 +25,10 @@ VGPU_PRETTY_NAME_STR, ) from utilities.artifactory import get_test_artifact_server_url -from utilities.constants import ( - DATA_SOURCE_STR, - DEFAULT_HCO_CONDITIONS, - OS_FLAVOR_WINDOWS, - OS_PROC_NAME, +from utilities.constants.hco import DEFAULT_HCO_CONDITIONS +from utilities.constants.images import OS_FLAVOR_WINDOWS +from utilities.constants.os_matrix import DATA_SOURCE_STR +from utilities.constants.timeouts import ( TCP_TIMEOUT_30SEC, TIMEOUT_1SEC, TIMEOUT_2MIN, @@ -37,6 +36,7 @@ TIMEOUT_30MIN, TIMEOUT_30SEC, ) +from utilities.constants.virt import OS_PROC_NAME from utilities.hco import ( ResourceEditorValidateHCOReconcile, is_hco_tainted,