diff --git a/tests/chaos/conftest.py b/tests/chaos/conftest.py index bc75e0c95c..87734d3813 100644 --- a/tests/chaos/conftest.py +++ b/tests/chaos/conftest.py @@ -18,19 +18,19 @@ terminate_process, ) from utilities.artifactory import get_artifactory_config_map, get_artifactory_secret -from utilities.constants import ( - KUBEMACPOOL_MAC_CONTROLLER_MANAGER, - OS_FLAVOR_RHEL, - PORT_80, +from utilities.constants import Images +from utilities.constants.components import KUBEMACPOOL_MAC_CONTROLLER_MANAGER +from utilities.constants.images import OS_FLAVOR_RHEL +from utilities.constants.instance_types import U1_SMALL +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.networking import PORT_80 +from utilities.constants.timeouts import ( TIMEOUT_2MIN, TIMEOUT_3MIN, TIMEOUT_5SEC, TIMEOUT_10MIN, TIMEOUT_10SEC, TIMEOUT_15MIN, - U1_SMALL, - Images, - NamespacesNames, ) from utilities.infra import ( ExecCommandOnPod, diff --git a/tests/chaos/migration/conftest.py b/tests/chaos/migration/conftest.py index f23af1e38c..d4c7d0d0f5 100644 --- a/tests/chaos/migration/conftest.py +++ b/tests/chaos/migration/conftest.py @@ -8,7 +8,7 @@ from tests.chaos.constants import HOST_LABEL from tests.chaos.migration.utils import taint_node_for_migration from tests.chaos.utils import rebooting_node -from utilities.constants import MIGRATION_POLICY_VM_LABEL +from utilities.constants.virt import MIGRATION_POLICY_VM_LABEL LOGGER = logging.getLogger(__name__) diff --git a/tests/chaos/migration/test_migration.py b/tests/chaos/migration/test_migration.py index a7c6bd4f93..a938f50234 100644 --- a/tests/chaos/migration/test_migration.py +++ b/tests/chaos/migration/test_migration.py @@ -10,17 +10,17 @@ assert_migration_result_and_cleanup, ) from tests.chaos.utils import verify_vm_service_reachable -from utilities.constants import ( - PORT_80, - QUARANTINED, +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.networking import PORT_80 +from utilities.constants.pytest import QUARANTINED +from utilities.constants.storage import StorageClassNames +from utilities.constants.timeouts import ( TIMEOUT_2MIN, TIMEOUT_3MIN, TIMEOUT_5MIN, TIMEOUT_5SEC, TIMEOUT_15MIN, TIMEOUT_30SEC, - NamespacesNames, - StorageClassNames, ) from utilities.infra import wait_for_pods_running from utilities.virt import wait_for_vmi_relocation_and_running diff --git a/tests/chaos/oadp/conftest.py b/tests/chaos/oadp/conftest.py index 79e1b875ed..44b6d31f9a 100644 --- a/tests/chaos/oadp/conftest.py +++ b/tests/chaos/oadp/conftest.py @@ -7,14 +7,16 @@ from timeout_sampler import TimeoutSampler from tests.chaos.utils import create_pod_deleting_thread, pod_deleting_process_recover -from utilities.constants import ( +from utilities.constants import Images +from utilities.constants.oadp import ( BACKUP_STORAGE_LOCATION, FILE_NAME_FOR_BACKUP, TEXT_TO_TEST, +) +from utilities.constants.timeouts import ( TIMEOUT_1MIN, TIMEOUT_3MIN, TIMEOUT_10MIN, - Images, ) from utilities.infra import ExecCommandOnPod, wait_for_node_status from utilities.oadp import VeleroBackup, create_rhel_vm diff --git a/tests/chaos/oadp/test_oadp.py b/tests/chaos/oadp/test_oadp.py index a5fe98c7ce..d198c71e43 100644 --- a/tests/chaos/oadp/test_oadp.py +++ b/tests/chaos/oadp/test_oadp.py @@ -3,7 +3,7 @@ import pytest from tests.os_params import RHEL_LATEST -from utilities.constants import TIMEOUT_10MIN +from utilities.constants.timeouts import TIMEOUT_10MIN LOGGER = logging.getLogger(__name__) diff --git a/tests/chaos/snapshot/conftest.py b/tests/chaos/snapshot/conftest.py index 25203959b3..d8ce5b2c3a 100644 --- a/tests/chaos/snapshot/conftest.py +++ b/tests/chaos/snapshot/conftest.py @@ -2,7 +2,12 @@ from ocp_resources.datavolume import DataVolume from tests.chaos.snapshot.utils import VirtualMachineSnapshotWithDeadline -from utilities.constants import OS_FLAVOR_RHEL, TIMEOUT_8MIN, TIMEOUT_10MIN, Images +from utilities.constants import Images +from utilities.constants.images import OS_FLAVOR_RHEL +from utilities.constants.timeouts import ( + TIMEOUT_8MIN, + TIMEOUT_10MIN, +) from utilities.virt import VirtualMachineForTests diff --git a/tests/chaos/snapshot/test_snapshot.py b/tests/chaos/snapshot/test_snapshot.py index d62a188cf9..8c00d4f668 100644 --- a/tests/chaos/snapshot/test_snapshot.py +++ b/tests/chaos/snapshot/test_snapshot.py @@ -4,7 +4,11 @@ from ocp_resources.virtual_machine_restore import VirtualMachineRestore from pytest_testconfig import py_config -from utilities.constants import TIMEOUT_5MIN, TIMEOUT_5SEC, NamespacesNames +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.timeouts import ( + TIMEOUT_5MIN, + TIMEOUT_5SEC, +) pytestmark = [ pytest.mark.chaos, diff --git a/tests/chaos/snapshot/utils.py b/tests/chaos/snapshot/utils.py index b3a3bd85da..aa388ab8c2 100644 --- a/tests/chaos/snapshot/utils.py +++ b/tests/chaos/snapshot/utils.py @@ -1,6 +1,9 @@ from ocp_resources.virtual_machine_snapshot import VirtualMachineSnapshot -from utilities.constants import TIMEOUT_4MIN, TIMEOUT_5MIN +from utilities.constants.timeouts import ( + TIMEOUT_4MIN, + TIMEOUT_5MIN, +) class VirtualMachineSnapshotWithDeadline(VirtualMachineSnapshot): diff --git a/tests/chaos/standard/test_standard.py b/tests/chaos/standard/test_standard.py index ba62054266..96aaa27cb3 100644 --- a/tests/chaos/standard/test_standard.py +++ b/tests/chaos/standard/test_standard.py @@ -3,13 +3,13 @@ from ocp_resources.virtual_machine import VirtualMachine from tests.chaos.constants import STRESS_NG -from utilities.constants import ( +from utilities.constants import Images +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.storage import StorageClassNames +from utilities.constants.timeouts import ( TIMEOUT_2MIN, TIMEOUT_5MIN, TIMEOUT_5SEC, - Images, - NamespacesNames, - StorageClassNames, ) from utilities.virt import VirtualMachineForTests, running_vm diff --git a/tests/chaos/utils.py b/tests/chaos/utils.py index e427d1ff8b..618f7b565e 100644 --- a/tests/chaos/utils.py +++ b/tests/chaos/utils.py @@ -20,10 +20,9 @@ from pytest_testconfig import py_config from timeout_sampler import TimeoutExpiredError, TimeoutSampler, TimeoutWatch -from utilities.constants import ( - DEFAULT_HCO_CONDITIONS, - MIGRATION_POLICY_VM_LABEL, - PORT_80, +from utilities.constants.hco import DEFAULT_HCO_CONDITIONS +from utilities.constants.networking import PORT_80 +from utilities.constants.timeouts import ( TIMEOUT_1MIN, TIMEOUT_2MIN, TIMEOUT_5MIN, @@ -33,6 +32,7 @@ TIMEOUT_30MIN, TIMEOUT_30SEC, ) +from utilities.constants.virt import MIGRATION_POLICY_VM_LABEL from utilities.data_collector import write_to_file from utilities.infra import ( ExecCommandOnPod, diff --git a/utilities/artifactory.py b/utilities/artifactory.py index 17b4fb126d..240037a394 100644 --- a/utilities/artifactory.py +++ b/utilities/artifactory.py @@ -9,7 +9,10 @@ from pytest_testconfig import config as py_config from timeout_sampler import TimeoutExpiredError, TimeoutSampler -from utilities.constants import TIMEOUT_1MIN, TIMEOUT_5SEC +from utilities.constants.timeouts import ( + TIMEOUT_1MIN, + TIMEOUT_5SEC, +) from utilities.data_utils import base64_encode_str LOGGER = logging.getLogger(__name__) diff --git a/utilities/console.py b/utilities/console.py index 9ad746566c..36458f5b6f 100644 --- a/utilities/console.py +++ b/utilities/console.py @@ -5,12 +5,12 @@ from ocp_resources.virtual_machine import VirtualMachine from timeout_sampler import TimeoutSampler, retry -from utilities.constants import ( +from utilities.constants.timeouts import ( TIMEOUT_5MIN, TIMEOUT_10SEC, TIMEOUT_30SEC, - VIRTCTL, ) +from utilities.constants.virt import VIRTCTL from utilities.data_collector import get_data_collector_base_directory LOGGER = logging.getLogger(__name__) diff --git a/utilities/cpu.py b/utilities/cpu.py index 366e33d42a..f54d39b4c4 100644 --- a/utilities/cpu.py +++ b/utilities/cpu.py @@ -5,11 +5,13 @@ from ocp_resources.resource import Resource from pytest_testconfig import config as py_config -from utilities.constants import ( +from utilities.constants.cluster import ( CPU_MODEL_LABEL_PREFIX, + KUBERNETES_ARCH_LABEL, +) +from utilities.constants.cpu_models import ( EXCLUDED_CPU_MODELS, EXCLUDED_OLD_CPU_MODELS, - KUBERNETES_ARCH_LABEL, ) if TYPE_CHECKING: diff --git a/utilities/data_collector.py b/utilities/data_collector.py index 0dc555a813..83fa8bbc92 100644 --- a/utilities/data_collector.py +++ b/utilities/data_collector.py @@ -13,7 +13,7 @@ import utilities.hco import utilities.infra -from utilities.constants import TIMEOUT_20MIN +from utilities.constants.timeouts import TIMEOUT_20MIN from utilities.must_gather import run_must_gather LOGGER = logging.getLogger(__name__) diff --git a/utilities/guest_support.py b/utilities/guest_support.py index dced22f423..5a8c580ad3 100644 --- a/utilities/guest_support.py +++ b/utilities/guest_support.py @@ -5,7 +5,12 @@ from pyhelper_utils.shell import run_ssh_commands from timeout_sampler import TimeoutSampler -from utilities.constants import HYPERV_FEATURES_LABELS_DOM_XML, TCP_TIMEOUT_30SEC, TIMEOUT_15SEC, TIMEOUT_90SEC +from utilities.constants.timeouts import ( + TCP_TIMEOUT_30SEC, + TIMEOUT_15SEC, + TIMEOUT_90SEC, +) +from utilities.constants.virt import HYPERV_FEATURES_LABELS_DOM_XML from utilities.virt import VirtualMachineForTests diff --git a/utilities/hco.py b/utilities/hco.py index 86f5a74392..e6cbcb5876 100644 --- a/utilities/hco.py +++ b/utilities/hco.py @@ -15,20 +15,22 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler import utilities.infra -from utilities.constants import ( +from utilities.constants.hco import ( DEFAULT_HCO_CONDITIONS, ENABLE_COMMON_BOOT_IMAGE_IMPORT, EXPECTED_STATUS_CONDITIONS, HCO_SUBSCRIPTION, IMAGE_CRON_STR, SSP_CR_COMMON_TEMPLATES_LIST_KEY_NAME, +) +from utilities.constants.storage import StorageClassNames +from utilities.constants.timeouts import ( TIMEOUT_2MIN, TIMEOUT_4MIN, TIMEOUT_5MIN, TIMEOUT_5SEC, TIMEOUT_10MIN, TIMEOUT_30MIN, - StorageClassNames, ) from utilities.ssp import ( wait_for_at_least_one_auto_update_data_import_cron, diff --git a/utilities/infra.py b/utilities/infra.py index 788b345eab..828d95c36c 100644 --- a/utilities/infra.py +++ b/utilities/infra.py @@ -47,15 +47,23 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler, retry import utilities.virt -from utilities.constants import ( +from utilities.constants.architecture import ( AMD_64, + X86_64, +) +from utilities.constants.cluster import ( AUDIT_LOGS_PATH, - CLUSTER, - HCO_CATALOG_SOURCE, KUBECONFIG, - NET_UTIL_CONTAINER_IMAGE, OC_ADM_LOGS_COMMAND, - PROMETHEUS_K8S, +) +from utilities.constants.components import ( + CLUSTER, + HCO_CATALOG_SOURCE, +) +from utilities.constants.monitoring import PROMETHEUS_K8S +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.networking import NET_UTIL_CONTAINER_IMAGE +from utilities.constants.timeouts import ( TIMEOUT_1MIN, TIMEOUT_2MIN, TIMEOUT_3MIN, @@ -66,10 +74,8 @@ TIMEOUT_10MIN, TIMEOUT_10SEC, TIMEOUT_30SEC, - VIRTCTL, - X86_64, - NamespacesNames, ) +from utilities.constants.virt import VIRTCTL from utilities.exceptions import ( UrlNotFoundError, UtilityPodNotFoundError, diff --git a/utilities/monitoring.py b/utilities/monitoring.py index 85616b74d3..1ba5df7bfe 100644 --- a/utilities/monitoring.py +++ b/utilities/monitoring.py @@ -2,10 +2,12 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler -from utilities.constants import ( +from utilities.constants.monitoring import ( FIRING_STATE, KUBEVIRT_HYPERCONVERGED_OPERATOR_HEALTH_STATUS, OPERATOR_HEALTH_IMPACT_VALUES, +) +from utilities.constants.timeouts import ( TIMEOUT_2MIN, TIMEOUT_5MIN, TIMEOUT_5SEC, diff --git a/utilities/must_gather.py b/utilities/must_gather.py index 82c56793fb..fc3dfe45e2 100644 --- a/utilities/must_gather.py +++ b/utilities/must_gather.py @@ -4,7 +4,10 @@ from pyhelper_utils.shell import run_command -from utilities.constants import TIMEOUT_15MIN, TIMEOUT_20MIN +from utilities.constants.timeouts import ( + TIMEOUT_15MIN, + TIMEOUT_20MIN, +) LOGGER = logging.getLogger(__name__) diff --git a/utilities/network.py b/utilities/network.py index 018ff513fc..6c11fe4156 100644 --- a/utilities/network.py +++ b/utilities/network.py @@ -29,7 +29,8 @@ import utilities.infra from libs.net.ip import ICMP_HEADER_SIZE, ip_header_size from libs.net.vmspec import IpNotFound, VMInterfaceStatusNotFoundError, lookup_iface_status_ip -from utilities.constants import ( +from utilities.constants.cluster import WORKERS_TYPE +from utilities.constants.networking import ( ACTIVE_BACKUP, FLAT_OVERLAY_STR, IPV4_STR, @@ -37,10 +38,11 @@ LINUX_BRIDGE, OVS_BRIDGE, SRIOV, +) +from utilities.constants.timeouts import ( TIMEOUT_3MIN, TIMEOUT_8MIN, TIMEOUT_90SEC, - WORKERS_TYPE, ) from utilities.hco import ResourceEditorValidateHCOReconcile diff --git a/utilities/oadp.py b/utilities/oadp.py index 155bc243c1..b735e7a26f 100644 --- a/utilities/oadp.py +++ b/utilities/oadp.py @@ -21,13 +21,13 @@ get_http_image_url, ) from utilities.console import Console -from utilities.constants import ( - LS_COMMAND, - OS_FLAVOR_RHEL, +from utilities.constants import Images +from utilities.constants.cluster import LS_COMMAND +from utilities.constants.images import OS_FLAVOR_RHEL +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.timeouts import ( TIMEOUT_5MIN, TIMEOUT_20SEC, - Images, - NamespacesNames, ) from utilities.infra import ( get_pod_by_name_prefix, diff --git a/utilities/operator.py b/utilities/operator.py index cde68ad3e7..ecc348ea32 100644 --- a/utilities/operator.py +++ b/utilities/operator.py @@ -22,9 +22,9 @@ from timeout_sampler import TimeoutExpiredError, TimeoutSampler import utilities.infra -from utilities.constants import ( - BASE_EXCEPTIONS_DICT, - DEFAULT_RESOURCE_CONDITIONS, +from utilities.constants.cluster import BASE_EXCEPTIONS_DICT +from utilities.constants.hco import DEFAULT_RESOURCE_CONDITIONS +from utilities.constants.timeouts import ( TIMEOUT_5MIN, TIMEOUT_5SEC, TIMEOUT_10MIN, diff --git a/utilities/os_utils.py b/utilities/os_utils.py index 32b81d1576..703c367082 100644 --- a/utilities/os_utils.py +++ b/utilities/os_utils.py @@ -5,27 +5,31 @@ from ocp_resources.template import Template -from utilities.constants import ( +from utilities.constants import Images +from utilities.constants.hco import DATA_SOURCE_NAME +from utilities.constants.images import ArchImages +from utilities.constants.instance_types import ( + FLAVOR_STR, + OS_STR, + PREFERENCE_STR, + WORKLOAD_STR, +) +from utilities.constants.os_matrix import ( CONTAINER_DISK_IMAGE_PATH_STR, - DATA_SOURCE_NAME, DATA_SOURCE_STR, DV_SIZE_STR, - FLAVOR_STR, IMAGE_NAME_STR, IMAGE_PATH_STR, LATEST_RELEASE_STR, - OS_STR, OS_VERSION_STR, - PREFERENCE_STR, TEMPLATE_LABELS_STR, +) +from utilities.constants.virt import ( WIN_2K19, WIN_2K22, WIN_2K25, WIN_10, WIN_11, - WORKLOAD_STR, - ArchImages, - Images, ) from utilities.exceptions import OsDictNotFoundError diff --git a/utilities/pytest_utils.py b/utilities/pytest_utils.py index a2caedde08..9315bef045 100644 --- a/utilities/pytest_utils.py +++ b/utilities/pytest_utils.py @@ -20,16 +20,20 @@ from utilities.architecture import get_cluster_architecture from utilities.bitwarden import get_cnv_tests_secret_by_name -from utilities.constants import ( +from utilities.constants.architecture import ( AMD_64, + MULTIARCH, + SUPPORTED_CPU_ARCHITECTURES, + SUPPORTED_MULTIARCH_OPTIONS, +) +from utilities.constants.cluster import ( CNV_TEST_RUN_IN_PROGRESS, CNV_TEST_RUN_IN_PROGRESS_NS, CNV_TESTS_CONTAINER, - MULTIARCH, POD_SECURITY_NAMESPACE_LABELS, - SANITY_TESTS_FAILURE, - SUPPORTED_CPU_ARCHITECTURES, - SUPPORTED_MULTIARCH_OPTIONS, +) +from utilities.constants.pytest import SANITY_TESTS_FAILURE +from utilities.constants.timeouts import ( TIMEOUT_2MIN, TIMEOUT_5MIN, ) diff --git a/utilities/sanity.py b/utilities/sanity.py index 98b8efca73..0bf435ddc4 100644 --- a/utilities/sanity.py +++ b/utilities/sanity.py @@ -15,7 +15,8 @@ from pytest_testconfig import config as py_config from timeout_sampler import TimeoutExpiredError -from utilities.constants import IMAGE_CRON_STR, KUBELET_READY_CONDITION +from utilities.constants.hco import IMAGE_CRON_STR +from utilities.constants.monitoring import KUBELET_READY_CONDITION from utilities.exceptions import ClusterSanityError, StorageSanityError from utilities.hco import wait_for_hco_conditions from utilities.infra import LOGGER, wait_for_pods_running diff --git a/utilities/ssp.py b/utilities/ssp.py index a6880b621e..c1ae3399b1 100644 --- a/utilities/ssp.py +++ b/utilities/ssp.py @@ -26,12 +26,12 @@ import utilities.infra import utilities.storage import utilities.virt -from utilities.constants import ( - DEFAULT_RESOURCE_CONDITIONS, - EIGHT_CPU_SOCKETS, - FOUR_GI_MEMORY, +from utilities.constants.components import ( SSP_KUBEVIRT_HYPERCONVERGED, SSP_OPERATOR, +) +from utilities.constants.hco import DEFAULT_RESOURCE_CONDITIONS +from utilities.constants.timeouts import ( TCP_TIMEOUT_30SEC, TIMEOUT_2MIN, TIMEOUT_3MIN, @@ -40,6 +40,10 @@ TIMEOUT_6MIN, TIMEOUT_10SEC, ) +from utilities.constants.virt import ( + EIGHT_CPU_SOCKETS, + FOUR_GI_MEMORY, +) LOGGER = logging.getLogger(__name__) diff --git a/utilities/storage.py b/utilities/storage.py index ca25c49362..3fe4d506ed 100644 --- a/utilities/storage.py +++ b/utilities/storage.py @@ -35,12 +35,15 @@ import utilities.virt as virt_util from utilities import console from utilities.artifactory import get_test_artifact_server_url -from utilities.constants import ( +from utilities.constants import Images +from utilities.constants.components import HPP_POOL +from utilities.constants.images import OS_FLAVOR_WINDOWS +from utilities.constants.networking import POD_CONTAINER_SPEC +from utilities.constants.storage import ( CDI_LABEL, HOTPLUG_DISK_SERIAL, - HPP_POOL, - OS_FLAVOR_WINDOWS, - POD_CONTAINER_SPEC, +) +from utilities.constants.timeouts import ( TIMEOUT_1MIN, TIMEOUT_1SEC, TIMEOUT_2MIN, @@ -54,7 +57,6 @@ TIMEOUT_30MIN, TIMEOUT_30SEC, TIMEOUT_60MIN, - Images, ) from utilities.exceptions import UrlNotFoundError diff --git a/utilities/unittests/test_oadp.py b/utilities/unittests/test_oadp.py index dbf5e16bf6..7f92ac54b5 100644 --- a/utilities/unittests/test_oadp.py +++ b/utilities/unittests/test_oadp.py @@ -25,11 +25,9 @@ from kubernetes.dynamic.exceptions import ResourceNotFoundError from ocp_resources.exceptions import ResourceTeardownError -from utilities.constants import ( - LS_COMMAND, - TIMEOUT_20SEC, - NamespacesNames, -) +from utilities.constants.cluster import LS_COMMAND +from utilities.constants.namespaces import NamespacesNames +from utilities.constants.timeouts import TIMEOUT_20SEC from utilities.oadp import ( VeleroBackup, VeleroRestore, diff --git a/utilities/unittests/test_os_utils.py b/utilities/unittests/test_os_utils.py index 46ee72d880..8fde91d0c1 100644 --- a/utilities/unittests/test_os_utils.py +++ b/utilities/unittests/test_os_utils.py @@ -6,7 +6,14 @@ import pytest -from utilities.constants import AMD_64, ARM_64, CENTOS_STREAM10_PREFERENCE, RHEL10_PREFERENCE +from utilities.constants.architecture import ( + AMD_64, + ARM_64, +) +from utilities.constants.instance_types import ( + CENTOS_STREAM10_PREFERENCE, + RHEL10_PREFERENCE, +) from utilities.exceptions import OsDictNotFoundError from utilities.os_utils import ( CENTOS_OS_MAPPING, diff --git a/utilities/unittests/test_pytest_utils.py b/utilities/unittests/test_pytest_utils.py index 72c3c7c459..ba3fc1a419 100644 --- a/utilities/unittests/test_pytest_utils.py +++ b/utilities/unittests/test_pytest_utils.py @@ -7,15 +7,17 @@ import pytest import utilities.constants -from utilities.constants import ( +from utilities.constants.architecture import ( AMD_64, ARM_64, - CENTOS_STREAM9_PREFERENCE, MULTIARCH, - OS_FLAVOR_FEDORA, - RHEL9_PREFERENCE, S390X, ) +from utilities.constants.images import OS_FLAVOR_FEDORA +from utilities.constants.instance_types import ( + CENTOS_STREAM9_PREFERENCE, + RHEL9_PREFERENCE, +) from utilities.exceptions import MissingEnvironmentVariableError, UnsupportedCPUArchitectureError # Circular dependencies are already mocked in conftest.py diff --git a/utilities/virt.py b/utilities/virt.py index 937fdaf427..ab03d1abbc 100644 --- a/utilities/virt.py +++ b/utilities/virt.py @@ -52,26 +52,34 @@ import utilities.infra from libs.net.cluster import is_ipv6_single_stack_cluster from utilities.console import Console -from utilities.constants import ( - CLOUD_INIT_DISK_NAME, - CLOUD_INIT_NO_CLOUD, - CNV_VM_SSH_KEY_PATH, +from utilities.constants import Images +from utilities.constants.architecture import ( + LINUX_AMD_64, + MULTIARCH, +) +from utilities.constants.components import ( + VIRT_API, + VIRT_HANDLER, + VIRT_LAUNCHER, +) +from utilities.constants.hco import ( DATA_SOURCE_NAME, DATA_SOURCE_NAMESPACE, DEFAULT_KUBEVIRT_CONDITIONS, - DV_DISK, - EVICTIONSTRATEGY, - IP_FAMILY_POLICY_PREFER_DUAL_STACK, - LINUX_AMD_64, - LINUX_STR, - MULTIARCH, +) +from utilities.constants.images import ( OS_FLAVOR_ALPINE, OS_FLAVOR_CIRROS, OS_FLAVOR_FEDORA, OS_FLAVOR_WINDOWS, - OS_PROC_NAME, - ROOTDISK, + ArchImages, +) +from utilities.constants.instance_types import LINUX_STR +from utilities.constants.networking import ( + IP_FAMILY_POLICY_PREFER_DUAL_STACK, SSH_PORT_22, +) +from utilities.constants.timeouts import ( TCP_TIMEOUT_30SEC, TIMEOUT_1MIN, TIMEOUT_1SEC, @@ -87,12 +95,16 @@ TIMEOUT_12MIN, TIMEOUT_25MIN, TIMEOUT_30MIN, - VIRT_API, - VIRT_HANDLER, - VIRT_LAUNCHER, +) +from utilities.constants.virt import ( + CLOUD_INIT_DISK_NAME, + CLOUD_INIT_NO_CLOUD, + CNV_VM_SSH_KEY_PATH, + DV_DISK, + EVICTIONSTRATEGY, + OS_PROC_NAME, + ROOTDISK, VIRTCTL, - ArchImages, - Images, ) from utilities.data_collector import collect_vnc_screenshot_for_vms from utilities.exceptions import MigrationStuckSchedulingError, ResourceValueError diff --git a/utilities/vnc_utils.py b/utilities/vnc_utils.py index 1b0c949b8c..902dee478c 100644 --- a/utilities/vnc_utils.py +++ b/utilities/vnc_utils.py @@ -1,7 +1,12 @@ import pexpect from timeout_sampler import TimeoutSampler -from utilities.constants import TIMEOUT_5MIN, TIMEOUT_5SEC, TIMEOUT_30SEC, VIRTCTL +from utilities.constants.timeouts import ( + TIMEOUT_5MIN, + TIMEOUT_5SEC, + TIMEOUT_30SEC, +) +from utilities.constants.virt import VIRTCTL from utilities.data_collector import get_data_collector_base_directory