refactor(constants): migrate tests/network/ to direct submodule imports

tests/network/bond/test_bond_modes.py

@@ -8,7 +8,7 @@
 
 import pytest
 
-from utilities.constants import TIMEOUT_9MIN
+from utilities.constants.timeouts import TIMEOUT_9MIN
 from utilities.infra import ExecCommandOnPod, get_node_selector_dict, get_node_selector_name
 from utilities.network import (
     BondNodeNetworkConfigurationPolicy,

tests/network/conftest.py

@@ -14,12 +14,8 @@
 from timeout_sampler import TimeoutExpiredError
 
 from libs.net.cluster import ipv4_supported_cluster, ipv6_supported_cluster
-from utilities.constants import (
-    CLUSTER,
-    CLUSTER_NETWORK_ADDONS_OPERATOR,
-    VIRT_HANDLER,
-    NamespacesNames,
-)
+from utilities.constants.components import CLUSTER, CLUSTER_NETWORK_ADDONS_OPERATOR, VIRT_HANDLER
+from utilities.constants.namespaces import NamespacesNames
 from utilities.infra import (
     get_deployment_by_name,
     wait_for_pods_running,

tests/network/connectivity/conftest.py

@@ -1,7 +1,7 @@
 import pytest
 
 from tests.network.connectivity.utils import create_running_vm, secondary_interfaces_cloud_init_data
-from utilities.constants import LINUX_BRIDGE, OVS_BRIDGE
+from utilities.constants.networking import LINUX_BRIDGE, OVS_BRIDGE
 from utilities.data_utils import name_prefix
 from utilities.infra import get_node_selector_dict
 from utilities.network import compose_cloud_init_data_dict, network_device, network_nad

tests/network/connectivity/test_pod_network.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from utilities.constants import IPV4_STR, IPV6_STR
+from utilities.constants.networking import IPV4_STR, IPV6_STR
 from utilities.infra import get_node_selector_dict
 from utilities.network import (
     compose_cloud_init_data_dict,

tests/network/flat_overlay/conftest.py

@@ -25,7 +25,8 @@
     is_port_number_available,
     start_nc_response_on_vm,
 )
-from utilities.constants import DEFAULT_RESOURCE_CONDITIONS, FLAT_OVERLAY_STR
+from utilities.constants.hco import DEFAULT_RESOURCE_CONDITIONS
+from utilities.constants.networking import FLAT_OVERLAY_STR
 from utilities.infra import create_ns, wait_for_consistent_resource_conditions
 from utilities.network import assert_ping_successful, network_nad
 from utilities.virt import migrate_vm_and_verify

tests/network/general/test_bridge_marker.py

@@ -3,7 +3,8 @@
 import pytest
 from timeout_sampler import TimeoutExpiredError
 
-from utilities.constants import LINUX_BRIDGE, TIMEOUT_2MIN, TIMEOUT_30SEC
+from utilities.constants.networking import LINUX_BRIDGE
+from utilities.constants.timeouts import TIMEOUT_2MIN, TIMEOUT_30SEC
 from utilities.infra import get_node_selector_dict
 from utilities.network import network_device, network_nad
 from utilities.virt import VirtualMachineForTests, fedora_vm_body

tests/network/general/test_cnv_tuning_regression.py

@@ -1,7 +1,7 @@
 import pytest
 
 from libs.net.ip import random_ipv4_address
-from utilities.constants import LINUX_BRIDGE
+from utilities.constants.networking import LINUX_BRIDGE
 from utilities.infra import get_node_selector_dict
 from utilities.network import compose_cloud_init_data_dict, network_device, network_nad
 from utilities.virt import VirtualMachineForTests, fedora_vm_body

tests/network/jumbo_frame/conftest.py

@@ -8,7 +8,8 @@
     cloud_init_data_for_secondary_traffic,
     create_vm_for_jumbo_test,
 )
-from utilities.constants import LINUX_BRIDGE, WORKER_NODE_LABEL_KEY
+from utilities.constants.cluster import WORKER_NODE_LABEL_KEY
+from utilities.constants.networking import LINUX_BRIDGE
 from utilities.infra import get_node_selector_dict
 from utilities.network import network_device, network_nad
 

tests/network/kubemacpool/conftest.py

@@ -3,7 +3,7 @@
 from ocp_resources.resource import ResourceEditor
 
 from tests.network.kubemacpool import utils as kmp_utils
-from utilities.constants import KMP_VM_ASSIGNMENT_LABEL, LINUX_BRIDGE
+from utilities.constants.networking import KMP_VM_ASSIGNMENT_LABEL, LINUX_BRIDGE
 from utilities.data_utils import name_prefix
 from utilities.hco import ResourceEditorValidateHCOReconcile
 from utilities.infra import create_ns, get_node_selector_dict

tests/network/l2_bridge/libl2bridge.py

@@ -24,15 +24,10 @@
 from tests.network.libs.connectivity import ARP_ISOLATION_SYSCTL_CMD
 from tests.network.utils import update_cloud_init_extra_user_data
 from utilities import console
-from utilities.constants import (
-    KUBEMACPOOL_MAC_CONTROLLER_MANAGER,
-    LINUX_BRIDGE,
-    NODE_TYPE_WORKER_LABEL,
-    SRIOV,
-    TIMEOUT_1MIN,
-    TIMEOUT_2MIN,
-    TIMEOUT_5SEC,
-)
+from utilities.constants.cluster import NODE_TYPE_WORKER_LABEL
+from utilities.constants.components import KUBEMACPOOL_MAC_CONTROLLER_MANAGER
+from utilities.constants.networking import LINUX_BRIDGE, SRIOV
+from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_2MIN, TIMEOUT_5SEC
 from utilities.infra import get_pod_by_name_prefix
 from utilities.network import (
     cloud_init_network_data,

tests/network/l2_bridge/test_bridge_nic_hot_plug.py

@@ -19,7 +19,8 @@
     set_secondary_static_ip_address,
     wait_for_interface_hot_plug_completion,
 )
-from utilities.constants import FLAT_OVERLAY_STR, QUARANTINED, SRIOV
+from utilities.constants.networking import FLAT_OVERLAY_STR, SRIOV
+from utilities.constants.pytest import QUARANTINED
 from utilities.network import (
     assert_ping_successful,
     network_nad,

tests/network/l2_bridge/test_l2_ovs_linux_bridge.py

@@ -8,7 +8,8 @@
 from libs.net.vmspec import lookup_iface_status_ip
 from tests.network.l2_bridge.libl2bridge import wait_for_no_packet_loss_after_connection
 from tests.network.libs.dhcpd import DHCP_IP_RANGE_START
-from utilities.constants import LINUX_BRIDGE, OVS_BRIDGE, TIMEOUT_2MIN
+from utilities.constants.networking import LINUX_BRIDGE, OVS_BRIDGE
+from utilities.constants.timeouts import TIMEOUT_2MIN
 from utilities.network import assert_ping_successful
 
 pytestmark = [pytest.mark.ipv4, pytest.mark.usefixtures("hyperconverged_ovs_annotations_enabled_scope_session")]

tests/network/libs/bgp.py

@@ -17,7 +17,9 @@
 from timeout_sampler import retry
 
 from libs.net.vmspec import IpNotFound
-from utilities.constants import DEFAULT_RESOURCE_CONDITIONS, NET_UTIL_CONTAINER_IMAGE, NamespacesNames
+from utilities.constants.hco import DEFAULT_RESOURCE_CONDITIONS
+from utilities.constants.namespaces import NamespacesNames
+from utilities.constants.networking import NET_UTIL_CONTAINER_IMAGE
 from utilities.infra import get_resources_by_name_prefix, wait_for_consistent_resource_conditions
 
 _EXTERNAL_FRR_IMAGE: Final[str] = "quay.io/frrouting/frr:10.6.0"

tests/network/libs/dhcpd.py

@@ -6,7 +6,7 @@
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 from libs.net.ip import random_ipv4_address
-from utilities.constants import TIMEOUT_5SEC, TIMEOUT_30SEC
+from utilities.constants.timeouts import TIMEOUT_5SEC, TIMEOUT_30SEC
 from utilities.network import LOGGER
 from utilities.virt import VirtualMachineForTests
 

tests/network/localnet/conftest.py

@@ -31,9 +31,7 @@
     localnet_cudn,
     localnet_vm,
 )
-from utilities.constants import (
-    WORKER_NODE_LABEL_KEY,
-)
+from utilities.constants.cluster import WORKER_NODE_LABEL_KEY
 from utilities.infra import create_ns
 from utilities.virt import migrate_vm_and_verify
 

tests/network/localnet/liblocalnet.py

@@ -16,7 +16,8 @@
 from tests.network.libs import cloudinit
 from tests.network.libs import cluster_user_defined_network as libcudn
 from tests.network.libs.label_selector import LabelSelector
-from utilities.constants import OVS_BRIDGE, WORKER_NODE_LABEL_KEY
+from utilities.constants.cluster import WORKER_NODE_LABEL_KEY
+from utilities.constants.networking import OVS_BRIDGE
 
 LOCALNET_BR_EX_NETWORK = "localnet-br-ex-network"
 LOCALNET_BR_EX_NETWORK_NO_VLAN = "localnet-br-ex-network-no-vlan"

tests/network/macspoof/conftest.py

@@ -10,7 +10,8 @@
 
 from libs.net.ip import random_ipv4_address
 from libs.net.vmspec import lookup_iface_status_ip
-from utilities.constants import LINUX_BRIDGE, TIMEOUT_30SEC
+from utilities.constants.networking import LINUX_BRIDGE
+from utilities.constants.timeouts import TIMEOUT_30SEC
 from utilities.data_utils import name_prefix
 from utilities.infra import get_node_selector_dict
 from utilities.network import (

tests/network/migration/test_migration.py

@@ -21,13 +21,8 @@
     assert_ssh_alive,
     run_ssh_in_background,
 )
-from utilities.constants import (
-    IP_FAMILY_POLICY_PREFER_DUAL_STACK,
-    IPV6_STR,
-    LINUX_BRIDGE,
-    TIMEOUT_1MIN,
-    TIMEOUT_2MIN,
-)
+from utilities.constants.networking import IP_FAMILY_POLICY_PREFER_DUAL_STACK, IPV6_STR, LINUX_BRIDGE
+from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_2MIN
 from utilities.infra import get_node_selector_dict
 from utilities.network import (
     assert_ping_successful,

tests/network/network_service/conftest.py

@@ -8,7 +8,7 @@
     SERVICE_IP_FAMILY_POLICY_SINGLE_STACK,
     basic_expose_command,
 )
-from utilities.constants import SSH_PORT_22
+from utilities.constants.networking import SSH_PORT_22
 from utilities.infra import get_node_selector_dict, run_virtctl_command
 from utilities.network import compose_cloud_init_data_dict
 from utilities.virt import VirtualMachineForTests, fedora_vm_body

tests/network/network_service/libservice.py

@@ -1,4 +1,4 @@
-from utilities.constants import SSH_PORT_22
+from utilities.constants.networking import SSH_PORT_22
 
 SERVICE_IP_FAMILY_POLICY_SINGLE_STACK = "SingleStack"
 SERVICE_IP_FAMILY_POLICY_PREFER_DUAL_STACK = "PreferDualStack"

tests/network/nmstate/conftest.py

@@ -4,7 +4,7 @@
 
 from tests.network.nmstate.libnmstate import NMSTATE_HANDLER
 from tests.network.utils import wait_for_address_on_iface
-from utilities.constants import LINUX_BRIDGE
+from utilities.constants.networking import LINUX_BRIDGE
 from utilities.data_utils import name_prefix
 from utilities.infra import get_daemonset_by_name, get_node_pod, get_node_selector_dict
 from utilities.network import network_device

tests/network/nmstate/test_connectivity_after_nmstate_changes.py

@@ -13,11 +13,8 @@
     assert_ssh_alive,
     run_ssh_in_background,
 )
-from utilities.constants import (
-    LINUX_BRIDGE,
-    TIMEOUT_1MIN,
-    TIMEOUT_5SEC,
-)
+from utilities.constants.networking import LINUX_BRIDGE
+from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_5SEC
 from utilities.data_utils import name_prefix
 from utilities.infra import get_node_selector_dict, get_pod_by_name_prefix
 from utilities.network import (

tests/network/nmstate/test_nmstate_management_iface.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from utilities.constants import PUBLIC_DNS_SERVER_IP
+from utilities.constants.networking import PUBLIC_DNS_SERVER_IP
 from utilities.network import assert_ping_successful
 
 LOGGER = logging.getLogger(__name__)

tests/network/provider_migration/conftest.py

@@ -27,7 +27,7 @@
     extract_vm_primary_network_data,
 )
 from utilities.bitwarden import get_cnv_tests_secret_by_name
-from utilities.constants import OS_FLAVOR_FEDORA
+from utilities.constants.images import OS_FLAVOR_FEDORA
 
 CUDN_LABEL: Final[dict] = {"cudn": "mtv"}
 CUDN_SUBNET_IPV4: Final[str] = "192.168.100.0/24"

tests/network/provider_migration/test_ip_persistence.py

@@ -4,7 +4,7 @@
 
 from libs.net.traffic_generator import client_server_active_connection, is_tcp_connection
 from libs.net.vmspec import lookup_iface_status, lookup_iface_status_ip, lookup_primary_network
-from utilities.constants import PUBLIC_DNS_SERVER_IP
+from utilities.constants.networking import PUBLIC_DNS_SERVER_IP
 from utilities.virt import migrate_vm_and_verify
 
 SERVER_PORT: Final[int] = 1234

tests/network/rdp/test_rdp_for_exposed_vm_svc.py

@@ -10,10 +10,8 @@
 from pytest_testconfig import config as py_config
 
 from tests.os_params import WINDOWS_2019, WINDOWS_2019_OS
-from utilities.constants import (
-    OS_FLAVOR_WINDOWS,
-    TIMEOUT_5MIN,
-)
+from utilities.constants.images import OS_FLAVOR_WINDOWS
+from utilities.constants.timeouts import TIMEOUT_5MIN
 from utilities.virt import VirtualMachineForTests, vm_instance_from_template, wait_for_windows_vm
 
 LOGGER = logging.getLogger(__name__)

tests/network/service_mesh/conftest.py

@@ -35,7 +35,9 @@
     ServiceMeshDeployments,
     ServiceMeshDeploymentService,
 )
-from utilities.constants import OS_FLAVOR_FEDORA, PORT_80, TIMEOUT_4MIN, TIMEOUT_10SEC
+from utilities.constants.images import OS_FLAVOR_FEDORA
+from utilities.constants.networking import PORT_80
+from utilities.constants.timeouts import TIMEOUT_4MIN, TIMEOUT_10SEC
 from utilities.infra import add_scc_to_service_account, create_ns, label_project, unique_name
 from utilities.virt import VirtualMachineForTests, fedora_vm_body, vm_console_run_commands
 

tests/network/service_mesh/utils.py

@@ -4,7 +4,7 @@
 import pytest
 
 from utilities import console
-from utilities.constants import TIMEOUT_1MIN, TIMEOUT_3MIN
+from utilities.constants.timeouts import TIMEOUT_1MIN, TIMEOUT_3MIN
 from utilities.virt import VirtualMachineForTests
 
 LOGGER = logging.getLogger(__name__)

tests/network/single_node_tests/test_network_sno_deployment.py

@@ -4,7 +4,7 @@
 from ocp_resources.daemonset import DaemonSet
 from ocp_resources.deployment import Deployment
 
-from utilities.constants import CLUSTER_NETWORK_ADDONS_OPERATOR
+from utilities.constants.components import CLUSTER_NETWORK_ADDONS_OPERATOR
 
 EXPECTED_CNAO_COMP_NAMES = [
     "multus",

tests/network/sriov/conftest.py

@@ -9,13 +9,9 @@
 from timeout_sampler import TimeoutSampler
 
 from tests.network.sriov.libsriov import MTU_9000, VM_SRIOV_IFACE_NAME, sriov_cloud_init_data, sriov_vm, vm_sriov_mac
-from utilities.constants import (
-    CNV_SUPPLEMENTAL_TEMPLATES_URL,
-    NODE_HUGE_PAGES_1GI_KEY,
-    SRIOV,
-    TIMEOUT_10MIN,
-    TIMEOUT_20SEC,
-)
+from utilities.constants.networking import SRIOV
+from utilities.constants.timeouts import TIMEOUT_10MIN, TIMEOUT_20SEC
+from utilities.constants.virt import CNV_SUPPLEMENTAL_TEMPLATES_URL, NODE_HUGE_PAGES_1GI_KEY
 from utilities.infra import get_node_selector_dict
 from utilities.network import (
     network_nad,

tests/network/sriov/libsriov.py

@@ -2,7 +2,7 @@
 
 from libs.net.cluster import ipv4_supported_cluster, ipv6_supported_cluster
 from libs.net.ip import random_ipv4_address, random_ipv6_address
-from utilities.constants import SRIOV
+from utilities.constants.networking import SRIOV
 from utilities.infra import get_node_selector_dict
 from utilities.network import compose_cloud_init_data_dict, sriov_network_dict
 from utilities.virt import VirtualMachineForTests, fedora_vm_body

tests/network/sriov/test_sriov.py

@@ -8,7 +8,7 @@
 from libs.net.vmspec import lookup_iface_status
 from tests.network.sriov.libsriov import MTU_9000
 from tests.network.utils import assert_no_ping
-from utilities.constants import QUARANTINED
+from utilities.constants.pytest import QUARANTINED
 from utilities.network import assert_ping_successful
 from utilities.virt import migrate_vm_and_verify
 

tests/network/upgrade/conftest.py

@@ -3,11 +3,8 @@
 
 from libs.net.ip import random_ipv4_address
 from tests.network.upgrade.libupgrade import KMP_DISABLED_LABEL
-from utilities.constants import (
-    ES_NONE,
-    KMP_VM_ASSIGNMENT_LABEL,
-    LINUX_BRIDGE,
-)
+from utilities.constants.networking import KMP_VM_ASSIGNMENT_LABEL, LINUX_BRIDGE
+from utilities.constants.virt import ES_NONE
 from utilities.infra import create_ns, get_node_selector_dict
 from utilities.network import cloud_init, network_nad
 from utilities.virt import VirtualMachineForTests, fedora_vm_body

tests/network/upgrade/test_upgrade_network.py

@@ -11,10 +11,8 @@
     IUO_UPGRADE_TEST_DEPENDENCY_NODE_ID,
     IUO_UPGRADE_TEST_ORDERING_NODE_ID,
 )
-from utilities.constants import (
-    DEPENDENCY_SCOPE_SESSION,
-    KMP_VM_ASSIGNMENT_LABEL,
-)
+from utilities.constants.networking import KMP_VM_ASSIGNMENT_LABEL
+from utilities.constants.pytest import DEPENDENCY_SCOPE_SESSION
 from utilities.network import (
     assert_ping_successful,
     get_vmi_mac_address_by_iface_name,

tests/network/user_defined_network/ip_specification/test_ip_specification.py

@@ -22,7 +22,7 @@
     ip_address_annotation,
     read_guest_interface_ipv4,
 )
-from utilities.constants import PUBLIC_DNS_SERVER_IP
+from utilities.constants.networking import PUBLIC_DNS_SERVER_IP
 from utilities.virt import migrate_vm_and_verify
 
 if TYPE_CHECKING:

tests/network/user_defined_network/test_user_defined_network.py

@@ -11,7 +11,9 @@
 from libs.net.udn import UDN_BINDING_DEFAULT_PLUGIN_NAME
 from libs.net.vmspec import lookup_iface_status_ip, lookup_primary_network
 from tests.network.libs.vm_factory import udn_vm
-from utilities.constants import PUBLIC_DNS_SERVER_IP, QUARANTINED, TIMEOUT_1MIN
+from utilities.constants.networking import PUBLIC_DNS_SERVER_IP
+from utilities.constants.pytest import QUARANTINED
+from utilities.constants.timeouts import TIMEOUT_1MIN
 from utilities.virt import migrate_vm_and_verify
 
 if TYPE_CHECKING: