CherryPicked: [cnv-4.20] net: Randomize IPv4 address (#2655)

cherry-pick
#2552
into cnv-4.20

requested-by azhivovk

Signed-off-by: Asia Khromov <[email protected]>
Co-authored-by: Asia Zhivov Khromov <[email protected]>

Author: openshift-virtualization-qe-bot

tests/network/bgp/conftest.py

@@ -29,6 +29,7 @@
     generate_frr_conf,
     wait_for_bgp_connection_established,
 )
+from tests.network.libs.ip import random_ipv4_address
 from tests.network.libs.label_selector import LabelSelector
 from tests.network.libs.nodenetworkstate import DEFAULT_ROUTE_V4, lookup_br_ex_gateway_v4
 from tests.network.libs.vm_factory import udn_vm
@@ -38,8 +39,8 @@
 BGP_DATA_PATH: Final[Path] = Path(__file__).resolve().parent / "data" / "frr-config"
 CUDN_BGP_LABEL: Final[dict] = {"cudn-bgp": "blue"}
 CUDN_SUBNET_IPV4: Final[str] = "192.168.10.0/24"
-EXTERNAL_PROVIDER_SUBNET_IPV4: Final[str] = "10.250.100.0/24"
-EXTERNAL_PROVIDER_IP_V4: Final[str] = "10.250.100.150/24"
+EXTERNAL_PROVIDER_SUBNET_IPV4: Final[str] = f"{random_ipv4_address(net_seed=1, host_address=0)}/24"
+EXTERNAL_PROVIDER_IP_V4: Final[str] = f"{random_ipv4_address(net_seed=1, host_address=150)}/24"
 IPERF3_SERVER_PORT: Final[int] = 2354
 
 

tests/network/macspoof/conftest.py

@@ -8,6 +8,7 @@
 from pyhelper_utils.shell import run_ssh_commands
 from timeout_sampler import TimeoutSampler
 
+from tests.network.libs.ip import random_ipv4_address
 from utilities.constants import LINUX_BRIDGE, TIMEOUT_30SEC
 from utilities.infra import get_node_selector_dict, name_prefix
 from utilities.network import (
@@ -102,7 +103,9 @@ def linux_bridge_attached_vma(
     linux_macspoof_nad,
 ):
     name = "vma"
-    networks, network_data_data = _networks_data(nad=linux_macspoof_nad, ip="10.200.0.1/24")
+    networks, network_data_data = _networks_data(
+        nad=linux_macspoof_nad, ip=f"{random_ipv4_address(net_seed=0, host_address=1)}/24"
+    )
     cloud_init_data = compose_cloud_init_data_dict(
         network_data=network_data_data,
     )
@@ -128,7 +131,9 @@ def linux_bridge_attached_vmb(
     linux_macspoof_nad,
 ):
     name = "vmb"
-    networks, network_data_data = _networks_data(nad=linux_macspoof_nad, ip="10.200.0.2/24")
+    networks, network_data_data = _networks_data(
+        nad=linux_macspoof_nad, ip=f"{random_ipv4_address(net_seed=0, host_address=2)}/24"
+    )
     cloud_init_data = compose_cloud_init_data_dict(
         network_data=network_data_data,
     )

tests/network/migration/test_migration.py

@@ -12,6 +12,7 @@
 from pyhelper_utils.shell import run_ssh_commands
 from timeout_sampler import TimeoutSampler
 
+from tests.network.libs.ip import random_ipv4_address
 from tests.network.utils import (
     assert_ssh_alive,
     run_ssh_in_background,
@@ -113,7 +114,9 @@ def vma(
 ):
     name = "vma"
     networks = {br1test_nad.name: br1test_nad.name}
-    network_data_data = {"ethernets": {"eth1": {"addresses": ["10.200.0.1/24"]}}}
+    network_data_data = {
+        "ethernets": {"eth1": {"addresses": [f"{random_ipv4_address(net_seed=0, host_address=1)}/24"]}}
+    }
     cloud_init_data = compose_cloud_init_data_dict(
         network_data=network_data_data,
         ipv6_network_data=dual_stack_network_data,
@@ -142,7 +145,9 @@ def vmb(
 ):
     name = "vmb"
     networks = {br1test_nad.name: br1test_nad.name}
-    network_data_data = {"ethernets": {"eth1": {"addresses": ["10.200.0.2/24"]}}}
+    network_data_data = {
+        "ethernets": {"eth1": {"addresses": [f"{random_ipv4_address(net_seed=0, host_address=2)}/24"]}}
+    }
     cloud_init_data = compose_cloud_init_data_dict(
         network_data=network_data_data,
         ipv6_network_data=dual_stack_network_data,

tests/network/upgrade/conftest.py

@@ -1,6 +1,7 @@
 import pytest
 from ocp_resources.virtual_machine import VirtualMachine
 
+from tests.network.libs.ip import random_ipv4_address
 from utilities.constants import (
     ES_NONE,
     KMP_DISABLED_LABEL,
@@ -43,7 +44,7 @@ def vma_upgrade_mac_spoof(worker_node1, unprivileged_client, upgrade_linux_macsp
         networks=vm_nad_networks_data,
         interfaces=sorted(vm_nad_networks_data.keys()),
         client=unprivileged_client,
-        cloud_init_data=cloud_init(ip_address="10.200.0.1"),
+        cloud_init_data=cloud_init(ip_address=random_ipv4_address(net_seed=0, host_address=1)),
         body=fedora_vm_body(name=name),
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
         run_strategy=VirtualMachine.RunStrategy.ALWAYS,
@@ -61,7 +62,7 @@ def vmb_upgrade_mac_spoof(worker_node1, unprivileged_client, upgrade_linux_macsp
         networks=vm_nad_networks_data,
         interfaces=sorted(vm_nad_networks_data.keys()),
         client=unprivileged_client,
-        cloud_init_data=cloud_init(ip_address="10.200.0.2"),
+        cloud_init_data=cloud_init(ip_address=random_ipv4_address(net_seed=0, host_address=2)),
         body=fedora_vm_body(name=name),
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
         run_strategy=VirtualMachine.RunStrategy.ALWAYS,

tests/network/utils.py

@@ -10,6 +10,7 @@
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 from tests.network.constants import BRCNV
+from tests.network.libs.ip import random_ipv4_address
 from utilities.constants import (
     IPV4_STR,
     OS_FLAVOR_FEDORA,
@@ -273,7 +274,9 @@ def vm_for_brcnv_tests(
     network_data = {"ethernets": {}}
     for idx, nad in enumerate(nads, start=1):
         networks[nad.name] = nad.name
-        network_data["ethernets"][f"eth{idx}"] = {"addresses": [f"10.0.20{idx}.{address_suffix}/24"]}
+        network_data["ethernets"][f"eth{idx}"] = {
+            "addresses": [f"{random_ipv4_address(net_seed=idx, host_address=address_suffix)}/24"]
+        }
     cloud_init_data = compose_cloud_init_data_dict(network_data=network_data)
 
     with VirtualMachineForTests(