colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ovs/ovsdb: add support for setting the bridge data path type

Browse Source
This commit is contained in:
Lubomir Rintel
2019-07-24 13:06:11 +02:00
parent 6cf390eb55
commit b70d0b3b38
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/ovs/nm-ovsdb.c
View File

@@ -445,6 +445,7 @@ _insert_bridge (json_t *params, NMConnection *bridge, json_t *new_ports)
gboolean mcast_snooping_enable = FALSE; gboolean mcast_snooping_enable = FALSE;
gboolean rstp_enable = FALSE; gboolean rstp_enable = FALSE;
gboolean stp_enable = FALSE; gboolean stp_enable = FALSE;
const char *datapath_type = NULL;
json_t *row; json_t *row;
s_ovs_bridge = nm_connection_get_setting_ovs_bridge (bridge); s_ovs_bridge = nm_connection_get_setting_ovs_bridge (bridge);
@@ -456,6 +457,7 @@ _insert_bridge (json_t *params, NMConnection *bridge, json_t *new_ports)
mcast_snooping_enable = nm_setting_ovs_bridge_get_mcast_snooping_enable (s_ovs_bridge); mcast_snooping_enable = nm_setting_ovs_bridge_get_mcast_snooping_enable (s_ovs_bridge);
rstp_enable = nm_setting_ovs_bridge_get_rstp_enable (s_ovs_bridge); rstp_enable = nm_setting_ovs_bridge_get_rstp_enable (s_ovs_bridge);
stp_enable = nm_setting_ovs_bridge_get_stp_enable (s_ovs_bridge); stp_enable = nm_setting_ovs_bridge_get_stp_enable (s_ovs_bridge);
datapath_type = nm_setting_ovs_bridge_get_datapath_type (s_ovs_bridge);
} }
if (fail_mode) if (fail_mode)
@@ -466,6 +468,8 @@ _insert_bridge (json_t *params, NMConnection *bridge, json_t *new_ports)
json_object_set_new (row, "rstp_enable", json_boolean (rstp_enable)); json_object_set_new (row, "rstp_enable", json_boolean (rstp_enable));
if (stp_enable) if (stp_enable)
json_object_set_new (row, "stp_enable", json_boolean (stp_enable)); json_object_set_new (row, "stp_enable", json_boolean (stp_enable));
if (datapath_type)
json_object_set_new (row, "datapath_type", json_string (datapath_type));
json_object_set_new (row, "name", json_string (nm_connection_get_interface_name (bridge))); json_object_set_new (row, "name", json_string (nm_connection_get_interface_name (bridge)));
json_object_set_new (row, "ports", json_pack ("[s, O]", "set", new_ports)); json_object_set_new (row, "ports", json_pack ("[s, O]", "set", new_ports));