refactor(constants): migrate chaos and utilities imports to submodules

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,

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

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

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

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

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
 
 

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,

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

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
 

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,

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

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

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:

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

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
 
 

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,

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,

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,

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

utilities/network.py

@@ -29,18 +29,20 @@
 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,
     IPV6_STR,
     LINUX_BRIDGE,
     OVS_BRIDGE,
     SRIOV,
+)
+from utilities.constants.timeouts import (
     TIMEOUT_3MIN,
     TIMEOUT_8MIN,
     TIMEOUT_90SEC,
-    WORKERS_TYPE,
 )
 from utilities.hco import ResourceEditorValidateHCOReconcile
 

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,

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,