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

ovs: don't replace all "other_config" in _set_bridge_mac()

Browse source 
Doing an "update" is wrong, because that will replace all "other_config"
entries. We only want to reset the "hwaddr".

Note that https://www.rfc-editor.org/rfc/rfc7047 says about
"<mutations>":

  If <mutator> is "insert", then each of the key-value pairs in
  the map in <value> is added to <column> only if its key is not
  already present.  The required type of <value> is slightly
  relaxed, in that it may have fewer than the minimum number of
  elements specified by the column's type.

That means, we need to first delete, and then insert the key.

Fixes: 5d4c8521a3 ('ovs: set MAC address on the bridge for local interfaces')
(cherry picked from commit 2641af2cc9)
This commit is contained in:
Thomas Haller 2023-01-11 19:51:18 +01:00 • committed by Lubomir Rintel
parent c3e1290e36
commit 83327bfc58
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -592,21 +592,30 @@ _set_bridge_ports(json_t *params, const char *ifname, json_t *new_ports)
static void
_set_bridge_mac(json_t *params, const char *ifname, const char *mac)
{
json_array_append_new(params,
json_pack("{s:s, s:s, s:{s:[s, [[s, s]]]}, s:[[s, s, s]]}",
"op",
"update",
"table",
"Bridge",
"row",
"other_config",
"map",
"hwaddr",
mac,
"where",
"name",
"==",
ifname));
json_array_append_new(
params,
json_pack("{s:s, s:s, s:[[s, s, [s, [s]]], [s, s, [s, [[s, s]]]]], s:[[s, s, s]]}",
"op",
"mutate",
"table",
"Bridge",
"mutations",
"other_config",
"delete",
"set",
"hwaddr",
"other_config",
"insert",
"map",
"hwaddr",
mac,
"where",
"name",
"==",
ifname));
}
/**