net, l2 bridge: Small fixes (#4097)

Small follow-up PR to apply requested changes:

#3567 (comment)

#3567 (comment)
- Client is a mandatory parameter
- Assign the DHCP interface on each VM according to the type
client/server
- Drop matrix in setup and use pytest.parametrize

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Tests**
* Expanded L2 bridge tests to run against both Linux and OVS bridge
types and added a class-scoped fixture for selecting device type.

* **Refactor**
* Test fixtures and VM setup updated to propagate the chosen bridge
device type and include explicit DHCP interface configuration for more
consistent test provisioning.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Author: rnetser

tests/network/l2_bridge/conftest.py

@@ -36,6 +36,11 @@
 VMB_MPLS_ROUTE_TAG = 200
 
 
+@pytest.fixture(scope="class")
+def bridge_device_type(request):
+    return request.param
+
+
 @pytest.fixture(scope="class")
 def l2_bridge_device_name(index_number):
     yield f"br{next(index_number)}test"
@@ -45,13 +50,13 @@ def l2_bridge_device_name(index_number):
 def l2_bridge_device_worker_1(
     nmstate_dependent_placeholder,
     admin_client,
-    bridge_device_matrix__class__,
     hosts_common_available_ports,
     worker_node1,
+    bridge_device_type,
     l2_bridge_device_name,
 ):
     with network_device(
-        interface_type=bridge_device_matrix__class__,
+        interface_type=bridge_device_type,
         nncp_name=f"l2-bridge-{name_prefix(worker_node1.name)}",
         interface_name=l2_bridge_device_name,
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
@@ -65,13 +70,13 @@ def l2_bridge_device_worker_1(
 def l2_bridge_device_worker_2(
     nmstate_dependent_placeholder,
     admin_client,
-    bridge_device_matrix__class__,
     hosts_common_available_ports,
     worker_node2,
+    bridge_device_type,
     l2_bridge_device_name,
 ):
     with network_device(
-        interface_type=bridge_device_matrix__class__,
+        interface_type=bridge_device_type,
         nncp_name=f"l2-bridge-{name_prefix(worker_node2.name)}",
         interface_name=l2_bridge_device_name,
         node_selector=get_node_selector_dict(node_selector=worker_node2.hostname),
@@ -84,17 +89,17 @@ def l2_bridge_device_worker_2(
 @pytest.fixture(scope="class")
 def dhcp_nad(
     admin_client,
-    bridge_device_matrix__class__,
     namespace,
     l2_bridge_device_worker_1,
     l2_bridge_device_worker_2,
-    l2_bridge_device_name,
     vlan_index_number,
+    bridge_device_type,
+    l2_bridge_device_name,
 ):
     vlan_tag = next(vlan_index_number)
     with network_nad(
         namespace=namespace,
-        nad_type=bridge_device_matrix__class__,
+        nad_type=bridge_device_type,
         nad_name=f"{l2_bridge_device_name}-dhcp-broadcast-nad-vlan-{vlan_tag}",
         interface_name=l2_bridge_device_name,
         vlan=vlan_tag,
@@ -106,15 +111,15 @@ def dhcp_nad(
 @pytest.fixture(scope="class")
 def custom_eth_type_llpd_nad(
     admin_client,
-    bridge_device_matrix__class__,
     namespace,
     l2_bridge_device_worker_1,
     l2_bridge_device_worker_2,
+    bridge_device_type,
     l2_bridge_device_name,
 ):
     with network_nad(
         namespace=namespace,
-        nad_type=bridge_device_matrix__class__,
+        nad_type=bridge_device_type,
         nad_name=f"{l2_bridge_device_name}-custom-eth-type-icmp-nad",
         interface_name=l2_bridge_device_name,
         client=admin_client,
@@ -125,15 +130,15 @@ def custom_eth_type_llpd_nad(
 @pytest.fixture(scope="class")
 def mpls_nad(
     admin_client,
-    bridge_device_matrix__class__,
     namespace,
     l2_bridge_device_worker_1,
     l2_bridge_device_worker_2,
+    bridge_device_type,
     l2_bridge_device_name,
 ):
     with network_nad(
         namespace=namespace,
-        nad_type=bridge_device_matrix__class__,
+        nad_type=bridge_device_type,
         nad_name=f"{l2_bridge_device_name}-mpls-nad",
         interface_name=l2_bridge_device_name,
         client=admin_client,
@@ -144,15 +149,15 @@ def mpls_nad(
 @pytest.fixture(scope="class")
 def dot1q_nad(
     admin_client,
-    bridge_device_matrix__class__,
     namespace,
     l2_bridge_device_worker_1,
     l2_bridge_device_worker_2,
+    bridge_device_type,
     l2_bridge_device_name,
 ):
     with network_nad(
         namespace=namespace,
-        nad_type=bridge_device_matrix__class__,
+        nad_type=bridge_device_type,
         nad_name=f"{l2_bridge_device_name}-dot1q-nad",
         interface_name=l2_bridge_device_name,
         client=admin_client,
@@ -202,6 +207,7 @@ def l2_bridge_running_vm_a(
         mpls_route_next_hop=random_ipv4_address(net_seed=4, host_address=2),
         client=unprivileged_client,
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
+        dhcp_interface_config={"addresses": [f"{interface_ip_addresses[2]}/24"]},
     ) as vm:
         vm.start(wait=True)
         vm.wait_for_agent_connected()
@@ -228,6 +234,7 @@ def l2_bridge_running_vm_b(namespace, worker_node2, l2_bridge_all_nads, unprivil
         mpls_route_next_hop=random_ipv4_address(net_seed=4, host_address=1),
         client=unprivileged_client,
         node_selector=get_node_selector_dict(node_selector=worker_node2.hostname),
+        dhcp_interface_config={"dhcp4": False},
     ) as vm:
         vm.start(wait=True)
         vm.wait_for_agent_connected()

tests/network/l2_bridge/libl2bridge.py

@@ -372,19 +372,20 @@ def bridge_attached_vm(
     mpls_dest_tag,
     mpls_route_next_hop,
     mpls_local_ip,
+    client,
+    dhcp_interface_config,
     cloud_init_extra_user_data=None,
-    client=None,
     node_selector=None,
 ):
     cloud_init_data = _cloud_init_data(
-        vm_name=name,
         ip_addresses=ip_addresses,
         mpls_local_ip=mpls_local_ip,
         mpls_local_tag=mpls_local_tag,
         mpls_dest_ip=mpls_dest_ip,
         mpls_dest_tag=mpls_dest_tag,
         mpls_route_next_hop=mpls_route_next_hop,
         cloud_init_extra_user_data=cloud_init_extra_user_data,
+        dhcp_interface_config=dhcp_interface_config,
     )
     with VirtualMachineAttachedToBridge(
         namespace=namespace,
@@ -404,29 +405,23 @@ def bridge_attached_vm(
 
 
 def _cloud_init_data(
-    vm_name,
     ip_addresses,
     mpls_local_ip,
     mpls_local_tag,
     mpls_dest_ip,
     mpls_dest_tag,
     mpls_route_next_hop,
     cloud_init_extra_user_data,
+    dhcp_interface_config,
 ):
     network_data_data = {
         "ethernets": {
             "eth1": {"addresses": [f"{ip_addresses[0]}/24"]},
             "eth2": {"addresses": [f"{ip_addresses[1]}/24"]},
             "eth4": {"addresses": [f"{ip_addresses[3]}/24"]},
+            DHCP_INTERFACE_NAME: dhcp_interface_config,
         },
     }
-    # Only DHCP server VM (vm-fedora-1) should have IP on eth3 interface
-    if vm_name == "vm-fedora-1":
-        network_data_data["ethernets"][DHCP_INTERFACE_NAME] = {"addresses": [f"{ip_addresses[2]}/24"]}
-
-    # DHCP client VM (vm-fedora-2) should be with dhcp=false, will be activated in test 'test_dhcp_broadcast'.
-    if vm_name == "vm-fedora-2":
-        network_data_data["ethernets"][DHCP_INTERFACE_NAME] = {"dhcp4": False}
 
     runcmd = [
         "modprobe mpls_router",  # In order to test mpls we need to load driver
@@ -466,7 +461,7 @@ def __init__(
         mpls_dest_ip: str,
         mpls_dest_tag: int,
         mpls_route_next_hop: str,
-        client: DynamicClient | None = None,
+        client: DynamicClient,
         cloud_init_data: dict[str, dict] | None = None,
         node_selector: dict[str, str] | None = None,
     ):

tests/network/l2_bridge/test_l2_ovs_linux_bridge.py

@@ -8,14 +8,15 @@
 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 TIMEOUT_2MIN
+from utilities.constants import LINUX_BRIDGE, OVS_BRIDGE, TIMEOUT_2MIN
 from utilities.network import assert_ping_successful
 
 pytestmark = [pytest.mark.ipv4, pytest.mark.usefixtures("hyperconverged_ovs_annotations_enabled_scope_session")]
 
 CUSTOM_ETH_PROTOCOL = "0x88B6"  # rfc5342 Local Experimental Ethertype. Used to test custom eth type
 
 
+@pytest.mark.parametrize("bridge_device_type", [LINUX_BRIDGE, OVS_BRIDGE], indirect=True)
 @pytest.mark.s390x
 class TestL2Bridge:
     """