Merge branch 'main' into kubevirt_vm_labels

OhadRevah · web-flow · commit 21a8ef77493f · 2025-11-12T11:19:38.000+02:00
diff --git a/libs/net/vmspec.py b/libs/net/vmspec.py
@@ -4,7 +4,7 @@
 from kubernetes.dynamic.client import ResourceField
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler, retry
 
-from libs.vm.spec import Devices, Interface, Network, SpecDisk, VMISpec, Volume
+from libs.vm.spec import Devices, Network, SpecDisk, VMISpec, Volume
 from libs.vm.vm import BaseVirtualMachine
 
 LOOKUP_IFACE_STATUS_TIMEOUT_SEC: Final[int] = 30
@@ -124,15 +124,6 @@ def lookup_primary_network(vm: BaseVirtualMachine) -> Network:
     raise VMInterfaceSpecNotFoundError(f"No interface connected to the primary network was found in VM {vm.name}.")
 
 
-def add_network_interface(vmi_spec: VMISpec, network: Network, interface: Interface) -> VMISpec:
-    vmi_spec.networks = vmi_spec.networks or []
-    vmi_spec.networks.append(network)
-    vmi_spec.domain.devices = vmi_spec.domain.devices or Devices()
-    vmi_spec.domain.devices.interfaces = vmi_spec.domain.devices.interfaces or []
-    vmi_spec.domain.devices.interfaces.append(interface)
-    return vmi_spec
-
-
 def add_volume_disk(vmi_spec: VMISpec, volume: Volume, disk: SpecDisk) -> VMISpec:
     vmi_spec.volumes = vmi_spec.volumes or []
     vmi_spec.volumes.append(volume)
diff --git a/tests/network/libs/cluster_user_defined_network.py b/tests/network/libs/cluster_user_defined_network.py
@@ -49,8 +49,8 @@ class Role(Enum):
 
     role: str
     physicalNetworkName: str  # noqa: N815
-    vlan: Vlan
     ipam: Ipam
+    vlan: Vlan | None = None
 
 
 @dataclass
diff --git a/tests/network/localnet/conftest.py b/tests/network/localnet/conftest.py
@@ -9,12 +9,18 @@
 from libs.net.traffic_generator import TcpServer
 from libs.net.traffic_generator import VMTcpClient as TcpClient
 from libs.net.vmspec import lookup_iface_status
+from libs.vm.spec import Interface, Multus, Network
 from libs.vm.vm import BaseVirtualMachine
+from tests.network.libs import cloudinit
 from tests.network.libs import cluster_user_defined_network as libcudn
 from tests.network.libs.ip import random_ipv4_address
 from tests.network.localnet.liblocalnet import (
     LINK_STATE_DOWN,
+    LOCALNET_BR_EX_INTERFACE,
+    LOCALNET_BR_EX_INTERFACE_NO_VLAN,
     LOCALNET_BR_EX_NETWORK,
+    LOCALNET_BR_EX_NETWORK_NO_VLAN,
+    LOCALNET_OVS_BRIDGE_INTERFACE,
     LOCALNET_OVS_BRIDGE_NETWORK,
     LOCALNET_TEST_LABEL,
     client_server_active_connection,
@@ -31,6 +37,7 @@
 from utilities.virt import migrate_vm_and_verify
 
 NNCP_INTERFACE_TYPE_OVS_BRIDGE = "ovs-bridge"
+PRIMARY_INTERFACE_NAME = "eth0"
 
 
 @pytest.fixture(scope="module")
@@ -95,25 +102,61 @@ def cudn_localnet(
         yield cudn
 
 
+@pytest.fixture(scope="module")
+def cudn_localnet_no_vlan(
+    namespace_localnet_1: Namespace,
+) -> Generator[libcudn.ClusterUserDefinedNetwork]:
+    with localnet_cudn(
+        name=LOCALNET_BR_EX_NETWORK_NO_VLAN,
+        match_labels=LOCALNET_TEST_LABEL,
+        physical_network_name=LOCALNET_BR_EX_NETWORK,
+    ) as cudn:
+        cudn.wait_for_status_success()
+        yield cudn
+
+
 @pytest.fixture(scope="module")
 def ipv4_localnet_address_pool() -> Generator[str]:
     return (f"{random_ipv4_address(net_seed=0, host_address=host_value)}/24" for host_value in range(1, 254))
 
 
+@pytest.fixture(scope="module")
+def vm_localnet_1_secondary_ip(ipv4_localnet_address_pool: Generator[str]) -> str:
+    return next(ipv4_localnet_address_pool)
+
+
 @pytest.fixture(scope="module")
 def vm_localnet_1(
     namespace_localnet_1: Namespace,
     ipv4_localnet_address_pool: Generator[str],
+    vm_localnet_1_secondary_ip: str,
     cudn_localnet: libcudn.ClusterUserDefinedNetwork,
+    cudn_localnet_no_vlan: libcudn.ClusterUserDefinedNetwork,
     unprivileged_client: DynamicClient,
 ) -> Generator[BaseVirtualMachine]:
+    """
+    Creates a VM with two interfaces:
+    - Primary interface (eth0): connected to VLAN-enabled localnet
+    - Secondary interface (eth1): connected to no-VLAN localnet
+    """
     with localnet_vm(
         namespace=namespace_localnet_1.name,
         name="test-vm1",
-        physical_network_name=cudn_localnet.name,
-        spec_logical_network=LOCALNET_BR_EX_NETWORK,
-        cidr=next(ipv4_localnet_address_pool),
         client=unprivileged_client,
+        networks=[
+            Network(name=LOCALNET_BR_EX_INTERFACE, multus=Multus(networkName=cudn_localnet.name)),
+            Network(name=LOCALNET_BR_EX_INTERFACE_NO_VLAN, multus=Multus(networkName=cudn_localnet_no_vlan.name)),
+        ],
+        interfaces=[
+            Interface(name=LOCALNET_BR_EX_INTERFACE, bridge={}),
+            Interface(name=LOCALNET_BR_EX_INTERFACE_NO_VLAN, bridge={}),
+        ],
+        network_data=cloudinit.NetworkData(
+            ethernets={
+                PRIMARY_INTERFACE_NAME: cloudinit.EthernetDevice(addresses=[next(ipv4_localnet_address_pool)]),
+                "eth1": cloudinit.EthernetDevice(addresses=[vm_localnet_1_secondary_ip]),
+            }
+        ),
     ) as vm:
         yield vm
 
@@ -128,10 +171,12 @@ def vm_localnet_2(
     with localnet_vm(
         namespace=namespace_localnet_2.name,
         name="test-vm2",
-        physical_network_name=cudn_localnet.name,
-        spec_logical_network=LOCALNET_BR_EX_NETWORK,
-        cidr=next(ipv4_localnet_address_pool),
         client=unprivileged_client,
+        networks=[Network(name=LOCALNET_BR_EX_INTERFACE, multus=Multus(networkName=cudn_localnet.name))],
+        interfaces=[Interface(name=LOCALNET_BR_EX_INTERFACE, bridge={})],
+        network_data=cloudinit.NetworkData(
+            ethernets={PRIMARY_INTERFACE_NAME: cloudinit.EthernetDevice(addresses=[next(ipv4_localnet_address_pool)])}
+        ),
     ) as vm:
         yield vm
 
@@ -156,7 +201,7 @@ def localnet_client(localnet_running_vms: tuple[BaseVirtualMachine, BaseVirtualM
     with create_traffic_client(
         server_vm=localnet_running_vms[0],
         client_vm=localnet_running_vms[1],
-        spec_logical_network=LOCALNET_BR_EX_NETWORK,
+        spec_logical_network=LOCALNET_BR_EX_INTERFACE,
     ) as client:
         assert client.is_running()
         yield client
@@ -227,11 +272,14 @@ def vm_ovs_bridge_localnet_link_down(
     with localnet_vm(
         namespace=namespace_localnet_1.name,
         name="localnet-ovs-link-down-vm",
-        physical_network_name=cudn_localnet_ovs_bridge.name,
-        spec_logical_network=LOCALNET_OVS_BRIDGE_NETWORK,
-        cidr=next(ipv4_localnet_address_pool),
         client=unprivileged_client,
-        interface_state=LINK_STATE_DOWN,
+        networks=[
+            Network(name=LOCALNET_OVS_BRIDGE_INTERFACE, multus=Multus(networkName=cudn_localnet_ovs_bridge.name))
+        ],
+        interfaces=[Interface(name=LOCALNET_OVS_BRIDGE_INTERFACE, bridge={}, state=LINK_STATE_DOWN)],
+        network_data=cloudinit.NetworkData(
+            ethernets={PRIMARY_INTERFACE_NAME: cloudinit.EthernetDevice(addresses=[next(ipv4_localnet_address_pool)])}
+        ),
     ) as vm:
         yield vm
 
@@ -246,10 +294,14 @@ def vm_ovs_bridge_localnet_1(
     with localnet_vm(
         namespace=namespace_localnet_1.name,
         name="localnet-ovs-vm1",
-        physical_network_name=cudn_localnet_ovs_bridge.name,
-        spec_logical_network=LOCALNET_OVS_BRIDGE_NETWORK,
-        cidr=next(ipv4_localnet_address_pool),
         client=unprivileged_client,
+        networks=[
+            Network(name=LOCALNET_OVS_BRIDGE_INTERFACE, multus=Multus(networkName=cudn_localnet_ovs_bridge.name))
+        ],
+        interfaces=[Interface(name=LOCALNET_OVS_BRIDGE_INTERFACE, bridge={})],
+        network_data=cloudinit.NetworkData(
+            ethernets={PRIMARY_INTERFACE_NAME: cloudinit.EthernetDevice(addresses=[next(ipv4_localnet_address_pool)])}
+        ),
     ) as vm:
         yield vm
 
@@ -264,10 +316,14 @@ def vm_ovs_bridge_localnet_2(
     with localnet_vm(
         namespace=namespace_localnet_1.name,
         name="localnet-ovs-vm2",
-        physical_network_name=cudn_localnet_ovs_bridge.name,
-        spec_logical_network=LOCALNET_OVS_BRIDGE_NETWORK,
-        cidr=next(ipv4_localnet_address_pool),
         client=unprivileged_client,
+        networks=[
+            Network(name=LOCALNET_OVS_BRIDGE_INTERFACE, multus=Multus(networkName=cudn_localnet_ovs_bridge.name))
+        ],
+        interfaces=[Interface(name=LOCALNET_OVS_BRIDGE_INTERFACE, bridge={})],
+        network_data=cloudinit.NetworkData(
+            ethernets={PRIMARY_INTERFACE_NAME: cloudinit.EthernetDevice(addresses=[next(ipv4_localnet_address_pool)])}
+        ),
     ) as vm:
         yield vm
 
@@ -279,7 +335,7 @@ def ovs_bridge_localnet_running_vms_one_with_interface_down(
     vm1, vm2 = run_vms(vms=(vm_ovs_bridge_localnet_link_down, vm_ovs_bridge_localnet_1))
     lookup_iface_status(
         vm=vm_ovs_bridge_localnet_link_down,
-        iface_name=LOCALNET_OVS_BRIDGE_NETWORK,
+        iface_name=LOCALNET_OVS_BRIDGE_INTERFACE,
         predicate=lambda interface: "guest-agent" in interface["infoSource"]
         and interface["linkState"] == LINK_STATE_DOWN,
     )
@@ -310,7 +366,7 @@ def localnet_ovs_bridge_client(
     with create_traffic_client(
         server_vm=ovs_bridge_localnet_running_vms[0],
         client_vm=ovs_bridge_localnet_running_vms[1],
-        spec_logical_network=LOCALNET_OVS_BRIDGE_NETWORK,
+        spec_logical_network=LOCALNET_OVS_BRIDGE_INTERFACE,
     ) as client:
         assert client.is_running()
         yield client
@@ -321,7 +377,7 @@ def localnet_vms_have_connectivity(localnet_running_vms: tuple[BaseVirtualMachin
     with client_server_active_connection(
         client_vm=localnet_running_vms[0],
         server_vm=localnet_running_vms[1],
-        spec_logical_network=LOCALNET_BR_EX_NETWORK,
+        spec_logical_network=LOCALNET_BR_EX_INTERFACE,
     ):
         pass
 
diff --git a/tests/network/localnet/liblocalnet.py b/tests/network/localnet/liblocalnet.py
@@ -7,17 +7,21 @@
 
 from libs.net.traffic_generator import TcpServer
 from libs.net.traffic_generator import VMTcpClient as TcpClient
-from libs.net.vmspec import IP_ADDRESS, add_network_interface, add_volume_disk, lookup_iface_status
+from libs.net.vmspec import IP_ADDRESS, add_volume_disk, lookup_iface_status
 from libs.vm.affinity import new_pod_anti_affinity
 from libs.vm.factory import base_vmspec, fedora_vm
-from libs.vm.spec import CloudInitNoCloud, Interface, Metadata, Multus, Network
+from libs.vm.spec import CloudInitNoCloud, Devices, Interface, Metadata, Network
 from libs.vm.vm import BaseVirtualMachine, cloudinitdisk_storage
 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
 
 LOCALNET_BR_EX_NETWORK = "localnet-br-ex-network"
+LOCALNET_BR_EX_NETWORK_NO_VLAN = "localnet-br-ex-network-no-vlan"
 LOCALNET_OVS_BRIDGE_NETWORK = "localnet-ovs-network"
+LOCALNET_BR_EX_INTERFACE = "localnet-iface-vlan"
+LOCALNET_BR_EX_INTERFACE_NO_VLAN = "localnet-iface-no-vlan"
+LOCALNET_OVS_BRIDGE_INTERFACE = "localnet-iface-ovs-bridge"
 LOCALNET_TEST_LABEL = {"test": "localnet"}
 LINK_STATE_UP = "up"
 LINK_STATE_DOWN = "down"
@@ -56,52 +60,64 @@ def create_traffic_client(
 def localnet_vm(
     namespace: str,
     name: str,
-    physical_network_name: str,
-    spec_logical_network: str,
-    cidr: str,
     client: DynamicClient,
-    interface_state: str | None = None,
+    networks: list[Network],
+    interfaces: list[Interface],
+    network_data: cloudinit.NetworkData,
 ) -> BaseVirtualMachine:
     """
-    Create a Fedora-based Virtual Machine connected to a given localnet network with a static IP configuration.
+    Create a Fedora-based Virtual Machine connected to localnet network(s).
 
     The VM will:
-    - Attach to a Multus network using a bridge interface.
     - Apply a specific label for anti-affinity scheduling.
-    - Use cloud-init to configure a static IP address.
     - Based on a standard Fedora VM template.
 
     Args:
         namespace (str): The namespace where the VM should be created.
         name (str): The name of the VM.
-        physical_network_name (str): The name of the Multus network to attach.
-        cidr (str): The CIDR address to assign to the VM's interface.
         client (DynamicClient): The Kubernetes dynamic client for resource creation.
-        spec_logical_network (str): The name of the localnet network to attach.
-        interface_state (str): The state of the interface (optional).
-            Possible values are "up" or "down". When not specified, it behaves as "up".
+        networks (list[Network]): List of Network objects defining the networks to attach.
+            Each Network should have a name and configuration.
+        interfaces (list[Interface]): List of Interface objects defining the interface configurations.
+            Each Interface should have a name matching a Network, and additional configuration and state.
+        network_data (cloudinit.NetworkData): Cloud-init NetworkData object containing the network
+            configuration for the VM interfaces.
 
     Returns:
         BaseVirtualMachine: The configured VM object ready for creation.
+
+    Example:
+        >>> networks = [
+        ...     Network(name="net1", multus=Multus(networkName="physical-net1")),
+        ...     Network(name="net2", multus=Multus(networkName="physical-net2")),
+        ... ]
+        >>> interfaces = [
+        ...     Interface(name="net1", bridge={}, state="up"),
+        ...     Interface(name="net2", bridge={}, state="up"),
+        ... ]
+        >>> network_data = cloudinit.NetworkData(ethernets={
+        ...     "eth0": cloudinit.EthernetDevice(addresses=["172.16.1.1/24"]),
+        ...     "eth1": cloudinit.EthernetDevice(addresses=["172.16.2.1/24"]),
+        ... })
+        >>> vm = localnet_vm(namespace="test-localnet", name="vm1", client=client,
+        ...                   networks=networks, interfaces=interfaces, network_data=network_data)
     """
     spec = base_vmspec()
     spec.template.metadata = spec.template.metadata or Metadata()
     spec.template.metadata.labels = spec.template.metadata.labels or {}
     spec.template.metadata.labels.update(LOCALNET_TEST_LABEL)
-    vmi_spec = spec.template.spec
 
-    vmi_spec = add_network_interface(
-        vmi_spec=vmi_spec,
-        network=Network(name=spec_logical_network, multus=Multus(networkName=physical_network_name)),
-        interface=Interface(name=spec_logical_network, bridge={}, state=interface_state),
-    )
+    vmi_spec = spec.template.spec
+    vmi_spec.networks = networks
+    vmi_spec.domain.devices = vmi_spec.domain.devices or Devices()
+    vmi_spec.domain.devices.interfaces = interfaces
 
-    netdata = cloudinit.NetworkData(ethernets={"eth0": cloudinit.EthernetDevice(addresses=[cidr])})
     # Prevents cloud-init from overriding the default OS user credentials
     userdata = cloudinit.UserData(users=[])
     disk, volume = cloudinitdisk_storage(
         data=CloudInitNoCloud(
-            networkData=cloudinit.asyaml(no_cloud=netdata), userData=cloudinit.format_cloud_config(userdata=userdata)
+            networkData=cloudinit.asyaml(no_cloud=network_data),
+            userData=cloudinit.format_cloud_config(userdata=userdata),
         )
     )
     vmi_spec = add_volume_disk(vmi_spec=vmi_spec, volume=volume, disk=disk)
@@ -113,7 +129,10 @@ def localnet_vm(
 
 
 def localnet_cudn(
-    name: str, match_labels: dict[str, str], vlan_id: int, physical_network_name: str
+    name: str,
+    match_labels: dict[str, str],
+    physical_network_name: str,
+    vlan_id: int | None = None,
 ) -> libcudn.ClusterUserDefinedNetwork:
     """
     Create a ClusterUserDefinedNetwork resource configured for localnet with the specified VLAN ID.
@@ -127,14 +146,18 @@ def localnet_cudn(
     Args:
         name (str): The name of the CUDN resource.
         match_labels (dict[str, str]): Labels for namespace selection.
-        vlan_id (int): The VLAN ID to configure for the network.
         physical_network_name (str): The name of the physical network to associate with the localnet configuration.
+        vlan_id (int|None): The VLAN ID to configure for the network. If None, no VLAN is configured.
 
     Returns:
         ClusterUserDefinedNetwork: The configured CUDN object ready for creation.
     """
     ipam = libcudn.Ipam(mode=libcudn.Ipam.Mode.DISABLED.value)
-    vlan = libcudn.Vlan(mode=libcudn.Vlan.Mode.ACCESS.value, access=libcudn.Access(id=vlan_id))
+    vlan = (
+        libcudn.Vlan(mode=libcudn.Vlan.Mode.ACCESS.value, access=libcudn.Access(id=vlan_id))
+        if vlan_id is not None
+        else None
+    )
     localnet = libcudn.Localnet(
         role=libcudn.Localnet.Role.SECONDARY.value, physicalNetworkName=physical_network_name, vlan=vlan, ipam=ipam
     )
diff --git a/tests/network/localnet/test_default_bridge.py b/tests/network/localnet/test_default_bridge.py
diff --git a/tests/network/localnet/test_ovs_bridge.py b/tests/network/localnet/test_ovs_bridge.py
