fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-21 10:41:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ovs: allow specifying a system OVS interface by MAC address

Browse source 
The OVS interface can be matched via MAC address; in that case, the
"connection.interface-name" property of the connection is empty.

When populating the ovsdb, we need to pass the actual interface name
from the device, not the one from the connection.

Fixes: 830a5a14cb ('device: add support for OpenVSwitch devices')

https://issues.redhat.com/browse/RHEL-34617
(cherry picked from commit be28a11735)
(cherry picked from commit 129f9e5be6)
(cherry picked from commit ecb26f5ad9)
This commit is contained in:
Beniamino Galvani 2024-06-20 16:49:59 +02:00 • committed by Íñigo Huguet
parent 4944eb6dd0
commit 810de21d03
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/devices/ovs/nm-ovsdb.c
View file

@ -461,7 +461,7 @@ ovsdb_call_method(NMOvsdb *self,
"new: add-interface bridge=%s port=%s interface=%s",
nm_connection_get_interface_name(call->payload.add_interface.bridge),
nm_connection_get_interface_name(call->payload.add_interface.port),
nm_connection_get_interface_name(call->payload.add_interface.interface));
nm_device_get_iface(call->payload.add_interface.interface_device));
break;
case OVSDB_DEL_INTERFACE:
call->payload.del_interface.ifname = g_strdup(payload->del_interface.ifname);
@ -945,7 +945,7 @@ _insert_interface(json_t *params,
row = json_pack("{s:s, s:s, s:o, s:o, s:o}",
"name",
nm_connection_get_interface_name(interface),
nm_device_get_iface(interface_device),
"type",
type ?: "",
"options",
@ -1196,7 +1196,7 @@ _add_interface(NMOvsdb *self,
bridge_name = nm_connection_get_interface_name(bridge);
port_name = nm_connection_get_interface_name(port);
interface_name = nm_connection_get_interface_name(interface);
interface_name = nm_device_get_iface(interface_device);
interface_is_local = nm_streq0(bridge_name, interface_name);
/* Determine cloned MAC addresses */