merge: branch 'lr/ovs-slaves'

https://github.com/NetworkManager/NetworkManager/pull/155

16 files changed, 213 insertions, 16 deletions

diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
index 9ee24e8107..e3b5574e8c 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
@@ -25,7 +25,7 @@
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently slaved to
+        Array of object paths representing devices which are currently enslaved to
         this device.
     -->
     <property name="Slaves" type="ao" access="read"/>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
index e64e400627..7f2605699d 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
@@ -25,7 +25,7 @@
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently slaved to
+        Array of object paths representing devices which are currently enslaved to
         this device.
     -->
     <property name="Slaves" type="ao" access="read"/>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
index 08ed5dc01b..402ee028b3 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
@@ -8,6 +8,16 @@
   <interface name="org.freedesktop.NetworkManager.Device.OvsBridge">
 
     <!--
+        Slaves:
+
+        Array of object paths representing ports which are currently enslaved to
+        this bridge.
+
+        Since: 1.14
+    -->
+    <property name="Slaves" type="ao" access="read"/>
+
+    <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
index d4900f510c..c2db70ffd1 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
@@ -8,6 +8,16 @@
   <interface name="org.freedesktop.NetworkManager.Device.OvsPort">
 
     <!--
+        Slaves:
+
+        Array of object paths representing interfaces which are currently enslaved to
+        this port.
+
+        Since: 1.14
+    -->
+    <property name="Slaves" type="ao" access="read"/>
+
+    <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Team.xml b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
index c187b511d1..2318dd6fcf 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Team.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
@@ -25,7 +25,7 @@
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently slaved to
+        Array of object paths representing devices which are currently enslaved to
         this device.
     -->
     <property name="Slaves" type="ao" access="read"/>
diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c
index bd5bc216a7..a4f0f5014c 100644
--- a/libnm-glib/nm-device-bond.c
+++ b/libnm-glib/nm-device-bond.c
@@ -134,7 +134,7 @@ nm_device_bond_get_carrier (NMDeviceBond *device)
  * nm_device_bond_get_slaves:
  * @device: a #NMDeviceBond
  *
- * Gets the devices currently slaved to @device.
+ * Gets the devices currently enslaved to @device.
  *
  * Returns: (element-type NMDevice): the #GPtrArray containing
  * #NMDevices that are slaves of @device. This is the internal
@@ -333,7 +333,7 @@ nm_device_bond_class_init (NMDeviceBondClass *bond_class)
 	/**
 	 * NMDeviceBond:slaves:
 	 *
-	 * The devices (#NMDevice) slaved to the bond device.
+	 * The devices (#NMDevice) enslaved to the bond device.
 	 *
 	 * Since: 0.9.8
 	 **/
diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c
index 20d65cfad3..d5a2bbbcc7 100644
--- a/libnm-glib/nm-device-bridge.c
+++ b/libnm-glib/nm-device-bridge.c
@@ -142,7 +142,7 @@ nm_device_bridge_get_carrier (NMDeviceBridge *device)
  * nm_device_bridge_get_slaves:
  * @device: a #NMDeviceBridge
  *
- * Gets the devices currently slaved to @device.
+ * Gets the devices currently enslaved to @device.
  *
  * Returns: (element-type NMDevice): the #GPtrArray containing
  * #NMDevices that are slaves of @device. This is the internal
@@ -345,7 +345,7 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class)
 	/**
 	 * NMDeviceBridge:slaves:
 	 *
-	 * The devices (#NMDevice) slaved to the bridge device.
+	 * The devices (#NMDevice) enslaved to the bridge device.
 	 *
 	 * Since: 0.9.8
 	 **/
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 9c43598f64..83b7c3b418 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -86,7 +86,7 @@ nm_device_bond_get_carrier (NMDeviceBond *device)
  * nm_device_bond_get_slaves:
  * @device: a #NMDeviceBond
  *
- * Gets the devices currently slaved to @device.
+ * Gets the devices currently enslaved to @device.
  *
  * Returns: (element-type NMDevice): the #GPtrArray containing
  * #NMDevices that are slaves of @device. This is the internal
@@ -250,7 +250,7 @@ nm_device_bond_class_init (NMDeviceBondClass *bond_class)
 	/**
 	 * NMDeviceBond:slaves: (type GPtrArray(NMDevice))
 	 *
-	 * The devices slaved to the bond device.
+	 * The devices enslaved to the bond device.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_SLAVES,
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 76934daa05..39c48d2ac8 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -86,7 +86,7 @@ nm_device_bridge_get_carrier (NMDeviceBridge *device)
  * nm_device_bridge_get_slaves:
  * @device: a #NMDeviceBridge
  *
- * Gets the devices currently slaved to @device.
+ * Gets the devices currently enslaved to @device.
  *
  * Returns: (element-type NMDevice): the #GPtrArray containing
  * #NMDevices that are slaves of @device. This is the internal
@@ -255,7 +255,7 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class)
 	/**
 	 * NMDeviceBridge:slaves: (type GPtrArray(NMDevice))
 	 *
-	 * The devices slaved to the bridge device.
+	 * The devices enslaved to the bridge device.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_SLAVES,
diff --git a/libnm/nm-device-ovs-bridge.c b/libnm/nm-device-ovs-bridge.c
index 798f6d20de..27ee97cf35 100644
--- a/libnm/nm-device-ovs-bridge.c
+++ b/libnm/nm-device-ovs-bridge.c
@@ -14,7 +14,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright 2017 Red Hat, Inc.
+ * Copyright 2017,2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -26,12 +26,21 @@
 #include "nm-setting-ovs-bridge.h"
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-connection.h"
+#include "nm-core-internal.h"
+
+enum {
+	PROP_0,
+	PROP_SLAVES,
+
+	LAST_PROP
+};
 
 /**
  * NMDeviceOvsBridge:
  */
 struct _NMDeviceOvsBridge {
 	NMDevice parent;
+	GPtrArray *slaves;
 };
 
 struct _NMDeviceOvsBridgeClass {
@@ -42,6 +51,26 @@ G_DEFINE_TYPE (NMDeviceOvsBridge, nm_device_ovs_bridge, NM_TYPE_DEVICE)
 
 /*****************************************************************************/
 
+/**
+ * nm_device_ovs_bridge_get_slaves:
+ * @device: a #NMDeviceOvsBridge
+ *
+ * Gets the ports currently enslaved to @device.
+ *
+ * Returns: (element-type NMDevice): the #GPtrArray containing
+ * #NMDevices that are slaves of @device. This is the internal
+ * copy used by the device, and must not be modified.
+ *
+ * Since: 1.14
+ **/
+const GPtrArray *
+nm_device_ovs_bridge_get_slaves (NMDeviceOvsBridge *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_OVS_BRIDGE (device), FALSE);
+
+	return device->slaves;
+}
+
 static const char *
 get_type_description (NMDevice *device)
 {
@@ -81,15 +110,66 @@ get_setting_type (NMDevice *device)
 /*****************************************************************************/
 
 static void
+init_dbus (NMObject *object)
+{
+	NMDeviceOvsBridge *device = NM_DEVICE_OVS_BRIDGE (object);
+	const NMPropertiesInfo property_info[] = {
+		{ NM_DEVICE_OVS_BRIDGE_SLAVES, &device->slaves, NULL, NM_TYPE_DEVICE },
+		{ NULL },
+	};
+
+	NM_OBJECT_CLASS (nm_device_ovs_bridge_parent_class)->init_dbus (object);
+
+	_nm_object_register_properties (object,
+	                                NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE,
+	                                property_info);
+}
+
+static void
+get_property (GObject *object,
+              guint prop_id,
+              GValue *value,
+              GParamSpec *pspec)
+{
+	NMDeviceOvsBridge *device = NM_DEVICE_OVS_BRIDGE (object);
+
+	switch (prop_id) {
+	case PROP_SLAVES:
+		g_value_take_boxed (value, _nm_utils_copy_object_array (nm_device_ovs_bridge_get_slaves (device)));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
 nm_device_ovs_bridge_init (NMDeviceOvsBridge *device)
 {
 }
 
 static void
+dispose (GObject *object)
+{
+	NMDeviceOvsBridge *device = NM_DEVICE_OVS_BRIDGE (object);
+
+	g_clear_pointer (&device->slaves, g_ptr_array_unref);
+
+	G_OBJECT_CLASS (nm_device_ovs_bridge_parent_class)->dispose (object);
+}
+
+static void
 nm_device_ovs_bridge_class_init (NMDeviceOvsBridgeClass *ovs_bridge_class)
 {
+	GObjectClass *object_class = G_OBJECT_CLASS (ovs_bridge_class);
+	NMObjectClass *nm_object_class = NM_OBJECT_CLASS (ovs_bridge_class);
 	NMDeviceClass *device_class = NM_DEVICE_CLASS (ovs_bridge_class);
 
+	object_class->get_property = get_property;
+	object_class->dispose = dispose;
+
+	nm_object_class->init_dbus = init_dbus;
+
 	device_class->get_type_description = get_type_description;
 	device_class->connection_compatible = connection_compatible;
 	device_class->get_setting_type = get_setting_type;
diff --git a/libnm/nm-device-ovs-bridge.h b/libnm/nm-device-ovs-bridge.h
index b4b0b98b00..13d542a321 100644
--- a/libnm/nm-device-ovs-bridge.h
+++ b/libnm/nm-device-ovs-bridge.h
@@ -14,7 +14,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright 2017 Red Hat, Inc.
+ * Copyright 2017,2018 Red Hat, Inc.
  */
 
 #ifndef __NM_DEVICE_OVS_BRIDGE_H__
@@ -35,11 +35,16 @@ G_BEGIN_DECLS
 #define NM_IS_DEVICE_OVS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_OVS_BRIDGE))
 #define NM_DEVICE_OVS_BRIDGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_OVS_BRIDGE, NMDeviceOvsBridgeClass))
 
+#define NM_DEVICE_OVS_BRIDGE_SLAVES "slaves"
+
 typedef struct _NMDeviceOvsBridgeClass NMDeviceOvsBridgeClass;
 
 NM_AVAILABLE_IN_1_10
 GType nm_device_ovs_bridge_get_type (void);
 
+NM_AVAILABLE_IN_1_14
+const GPtrArray *nm_device_ovs_bridge_get_slaves (NMDeviceOvsBridge *device);
+
 G_END_DECLS
 
 #endif /* __NM_DEVICE_OVS_BRIDGE_H__ */
diff --git a/libnm/nm-device-ovs-port.c b/libnm/nm-device-ovs-port.c
index 17176dba3c..8be5549a7c 100644
--- a/libnm/nm-device-ovs-port.c
+++ b/libnm/nm-device-ovs-port.c
@@ -14,7 +14,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright 2017 Red Hat, Inc.
+ * Copyright 2017,2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -26,12 +26,21 @@
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-connection.h"
+#include "nm-core-internal.h"
+
+enum {
+	PROP_0,
+	PROP_SLAVES,
+
+	LAST_PROP
+};
 
 /**
  * NMDeviceOvsPort:
  */
 struct _NMDeviceOvsPort {
 	NMDevice parent;
+	GPtrArray *slaves;
 };
 
 struct _NMDeviceOvsPortClass {
@@ -42,6 +51,26 @@ G_DEFINE_TYPE (NMDeviceOvsPort, nm_device_ovs_port, NM_TYPE_DEVICE)
 
 /*****************************************************************************/
 
+/**
+ * nm_device_ovs_port_get_slaves:
+ * @device: a #NMDeviceOvsPort
+ *
+ * Gets the interfaces currently enslaved to @device.
+ *
+ * Returns: (element-type NMDevice): the #GPtrArray containing
+ * #NMDevices that are slaves of @device. This is the internal
+ * copy used by the device, and must not be modified.
+ *
+ * Since: 1.14
+ **/
+const GPtrArray *
+nm_device_ovs_port_get_slaves (NMDeviceOvsPort *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_OVS_PORT (device), FALSE);
+
+	return device->slaves;
+}
+
 static const char *
 get_type_description (NMDevice *device)
 {
@@ -80,15 +109,66 @@ get_setting_type (NMDevice *device)
 /*****************************************************************************/
 
 static void
+init_dbus (NMObject *object)
+{
+	NMDeviceOvsPort *device = NM_DEVICE_OVS_PORT (object);
+	const NMPropertiesInfo property_info[] = {
+		{ NM_DEVICE_OVS_PORT_SLAVES, &device->slaves, NULL, NM_TYPE_DEVICE },
+		{ NULL },
+	};
+
+	NM_OBJECT_CLASS (nm_device_ovs_port_parent_class)->init_dbus (object);
+
+	_nm_object_register_properties (object,
+	                                NM_DBUS_INTERFACE_DEVICE_OVS_PORT,
+	                                property_info);
+}
+
+static void
+get_property (GObject *object,
+              guint prop_id,
+              GValue *value,
+              GParamSpec *pspec)
+{
+	NMDeviceOvsPort *device = NM_DEVICE_OVS_PORT (object);
+
+	switch (prop_id) {
+	case PROP_SLAVES:
+		g_value_take_boxed (value, _nm_utils_copy_object_array (nm_device_ovs_port_get_slaves (device)));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
 nm_device_ovs_port_init (NMDeviceOvsPort *device)
 {
 }
 
 static void
+dispose (GObject *object)
+{
+	NMDeviceOvsPort *device = NM_DEVICE_OVS_PORT (object);
+
+	g_clear_pointer (&device->slaves, g_ptr_array_unref);
+
+	G_OBJECT_CLASS (nm_device_ovs_port_parent_class)->dispose (object);
+}
+
+static void
 nm_device_ovs_port_class_init (NMDeviceOvsPortClass *ovs_port_class)
 {
+	GObjectClass *object_class = G_OBJECT_CLASS (ovs_port_class);
+	NMObjectClass *nm_object_class = NM_OBJECT_CLASS (ovs_port_class);
 	NMDeviceClass *device_class = NM_DEVICE_CLASS (ovs_port_class);
 
+	object_class->get_property = get_property;
+	object_class->dispose = dispose;
+
+	nm_object_class->init_dbus = init_dbus;
+
 	device_class->get_type_description = get_type_description;
 	device_class->connection_compatible = connection_compatible;
 	device_class->get_setting_type = get_setting_type;
diff --git a/libnm/nm-device-ovs-port.h b/libnm/nm-device-ovs-port.h
index af661e7b82..088e3692de 100644
--- a/libnm/nm-device-ovs-port.h
+++ b/libnm/nm-device-ovs-port.h
@@ -14,7 +14,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright 2017 Red Hat, Inc.
+ * Copyright 2017,2018 Red Hat, Inc.
  */
 
 #ifndef __NM_DEVICE_OVS_PORT_H__
@@ -35,11 +35,16 @@ G_BEGIN_DECLS
 #define NM_IS_DEVICE_OVS_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_OVS_PORT))
 #define NM_DEVICE_OVS_PORT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_OVS_PORT, NMDeviceOvsPortClass))
 
+#define NM_DEVICE_OVS_PORT_SLAVES "slaves"
+
 typedef struct _NMDeviceOvsPortClass NMDeviceOvsPortClass;
 
 NM_AVAILABLE_IN_1_10
 GType nm_device_ovs_port_get_type (void);
 
+NM_AVAILABLE_IN_1_14
+const GPtrArray *nm_device_ovs_port_get_slaves (NMDeviceOvsPort *device);
+
 G_END_DECLS
 
 #endif /* __NM_DEVICE_OVS_PORT_H__ */
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 010a0521c8..d145f8fc20 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -120,7 +120,8 @@ nm_device_state_reason_check (NMDeviceStateReason reason)
 #define NM_DEVICE_PARENT           "parent"
 
 /* the "slaves" property is internal in the parent class, but exposed
- * by the derived classes NMDeviceBond, NMDeviceBridge and NMDeviceTeam. */
+ * by the derived classes NMDeviceBond, NMDeviceBridge, NMDeviceTeam,
+ * NMDeviceOvsBridge and NMDeviceOvsPort. */
 #define NM_DEVICE_SLAVES           "slaves"         /* partially internal */
 
 #define NM_DEVICE_TYPE_DESC        "type-desc"      /* Internal only */
diff --git a/src/devices/ovs/nm-device-ovs-bridge.c b/src/devices/ovs/nm-device-ovs-bridge.c
index 5244ca8bfb..2e4d1cbdf8 100644
--- a/src/devices/ovs/nm-device-ovs-bridge.c
+++ b/src/devices/ovs/nm-device-ovs-bridge.c
@@ -134,6 +134,9 @@ nm_device_ovs_bridge_init (NMDeviceOvsBridge *self)
 static const NMDBusInterfaceInfoExtended interface_info_device_ovs_bridge = {
 	.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT (
 		NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE,
+		.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS (
+			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Slaves", "ao", NM_DEVICE_SLAVES),
+		),
 		.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS (
 			&nm_signal_info_property_changed_legacy,
 		),
diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/devices/ovs/nm-device-ovs-port.c
index 91cf4f4d8b..a9a2b24a2b 100644
--- a/src/devices/ovs/nm-device-ovs-port.c
+++ b/src/devices/ovs/nm-device-ovs-port.c
@@ -180,6 +180,9 @@ nm_device_ovs_port_init (NMDeviceOvsPort *self)
 static const NMDBusInterfaceInfoExtended interface_info_device_ovs_port = {
 	.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT (
 		NM_DBUS_INTERFACE_DEVICE_OVS_PORT,
+		.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS (
+			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Slaves", "ao", NM_DEVICE_SLAVES),
+		),
 		.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS (
 			&nm_signal_info_property_changed_legacy,
 		),