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

ovs/ovsdb: signal a failure when an error column is set

Browse source 
When an interface (other OVS device types can not fail)  encounters an error
it indicates it by changing the error column. Watch for those changes so
that we can eventually communicate them to the OVS factory to deal with
them.

(cherry picked from commit f2c066e104)
This commit is contained in:
Lubomir Rintel 2019-06-12 17:15:13 +02:00 • committed by Thomas Haller
parent 4107490c89
commit cb19680d34
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/devices/ovs/nm-ovsdb.c
View file

@ -59,6 +59,7 @@ typedef struct {
enum {
DEVICE_ADDED,
DEVICE_REMOVED,
INTERFACE_FAILED,
LAST_SIGNAL
};
@ -787,14 +788,14 @@ ovsdb_next_command (NMOvsdb *self)
msg = json_pack ("{s:i, s:s, s:[s, n, {"
" s:[{s:[s, s, s]}],"
" s:[{s:[s, s, s]}],"
" s:[{s:[s, s, s]}],"
" s:[{s:[s, s, s, s]}],"
" s:[{s:[]}]"
"}]}",
"id", call->id,
"method", "monitor", "params", "Open_vSwitch",
"Bridge", "columns", "name", "ports", "external_ids",
"Port", "columns", "name", "interfaces", "external_ids",
"Interface", "columns", "name", "type", "external_ids",
"Interface", "columns", "name", "type", "external_ids", "error",
"Open_vSwitch", "columns");
break;
case OVSDB_ADD_INTERFACE:
@ -934,15 +935,17 @@ ovsdb_got_update (NMOvsdb *self, json_t *msg)
/* Interfaces */
json_object_foreach (interface, key, value) {
json_t *error = NULL;
gboolean old = FALSE;
gboolean new = FALSE;
if (json_unpack (value, "{s:{}}", "old") == 0)
old = TRUE;
if (json_unpack (value, "{s:{s:s, s:s, s:o}}", "new",
if (json_unpack (value, "{s:{s:s, s:s, s?:o, s:o}}", "new",
"name", &name,
"type", &type,
"error", &error,
"external_ids", &external_ids) == 0)
new = TRUE;
@ -987,6 +990,14 @@ ovsdb_got_update (NMOvsdb *self, json_t *msg)
ovs_interface->name, NM_DEVICE_TYPE_OVS_INTERFACE);
}
}
/* The error is a string. No error is indicated by an empty set,
* because why the fuck not: [ "set": [] ] */
if (error && json_is_string (error)) {
g_signal_emit (self, signals[INTERFACE_FAILED], 0,
ovs_interface->name,
ovs_interface->connection_uuid,
json_string_value (error));
}
g_hash_table_insert (priv->interfaces, g_strdup (key), ovs_interface);
}
}
@ -1641,4 +1652,11 @@ nm_ovsdb_class_init (NMOvsdbClass *klass)
G_SIGNAL_RUN_LAST,
0, NULL, NULL, NULL,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_UINT);
signals[INTERFACE_FAILED] =
g_signal_new (NM_OVSDB_INTERFACE_FAILED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0, NULL, NULL, NULL,
G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
}

5
src/devices/ovs/nm-ovsdb.h
View file

@ -27,8 +27,9 @@
#define NM_IS_OVSDB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_OVSDB))
#define NM_OVSDB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_OVSDB, NMOvsdbClass))
#define NM_OVSDB_DEVICE_ADDED "device-added"
#define NM_OVSDB_DEVICE_REMOVED "device-removed"
#define NM_OVSDB_DEVICE_ADDED "device-added"
#define NM_OVSDB_DEVICE_REMOVED "device-removed"
#define NM_OVSDB_INTERFACE_FAILED "interface-failed"
typedef struct _NMOvsdb NMOvsdb;
typedef struct _NMOvsdbClass NMOvsdbClass;