libnm: add support for ovs-interface devices

6 files changed, 177 insertions, 30 deletions

diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index 97327f92d6..407fd62c60 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -41,6 +41,7 @@
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
 #include "nm-device-olpc-mesh.h"
+#include "nm-device-ovs-interface.h"
 #include "nm-device-team.h"
 #include "nm-device-tun.h"
 #include "nm-device-vlan.h"
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index d1d0bd442b..0b3378cfbd 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1186,6 +1186,7 @@ global:
 	nm_client_connectivity_check_get_enabled;
 	nm_client_connectivity_check_set_enabled;
 	nm_device_dummy_get_hw_address;
+	nm_device_ovs_interface_get_type;
 	nm_device_ppp_get_type;
 	nm_ip_route_equal_full;
 	nm_setting_bridge_get_group_forward_mask;
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 8912a5f419..e608499040 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -63,6 +63,7 @@
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
 #include "nm-device-olpc-mesh.h"
+#include "nm-device-ovs-interface.h"
 #include "nm-device-ppp.h"
 #include "nm-device-team.h"
 #include "nm-device-tun.h"
@@ -2147,6 +2148,8 @@ obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager
 			type = NM_TYPE_DEVICE_MODEM;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_OLPC_MESH) == 0)
 			type = NM_TYPE_DEVICE_OLPC_MESH;
+		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE) == 0)
+			type = NM_TYPE_DEVICE_OVS_INTERFACE;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_PPP) == 0)
 			type = NM_TYPE_DEVICE_PPP;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_TEAM) == 0)
diff --git a/libnm/nm-device-ovs-interface.c b/libnm/nm-device-ovs-interface.c
new file mode 100644
index 0000000000..ed3dbd4ca4
--- /dev/null
+++ b/libnm/nm-device-ovs-interface.c
@@ -0,0 +1,96 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <string.h>
+
+#include "nm-device-ovs-interface.h"
+#include "nm-object-private.h"
+#include "nm-setting-ovs-interface.h"
+#include "nm-setting-ovs-port.h"
+#include "nm-setting-connection.h"
+
+/**
+ * NMDeviceOvsInterface:
+ */
+struct _NMDeviceOvsInterface {
+	NMDevice parent;
+};
+
+struct _NMDeviceOvsInterfaceClass {
+	NMDeviceClass parent;
+};
+
+G_DEFINE_TYPE (NMDeviceOvsInterface, nm_device_ovs_interface, NM_TYPE_DEVICE)
+
+/*****************************************************************************/
+
+static const char *
+get_type_description (NMDevice *device)
+{
+	return "ovs-interface";
+}
+
+static gboolean
+connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
+{
+	const char *iface_name;
+
+	if (!NM_DEVICE_CLASS (nm_device_ovs_interface_parent_class)->connection_compatible (device, connection, error))
+		return FALSE;
+
+	if (!nm_connection_is_type (connection, NM_SETTING_OVS_INTERFACE_SETTING_NAME)) {
+		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+		                     _("The connection was not a ovs_interface connection."));
+		return FALSE;
+	}
+
+	iface_name = nm_connection_get_interface_name (connection);
+	if (!iface_name) {
+		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION,
+		                     _("The connection did not specify an interface name."));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static GType
+get_setting_type (NMDevice *device)
+{
+	return NM_TYPE_SETTING_OVS_INTERFACE;
+}
+
+/*****************************************************************************/
+
+static void
+nm_device_ovs_interface_init (NMDeviceOvsInterface *device)
+{
+}
+
+static void
+nm_device_ovs_interface_class_init (NMDeviceOvsInterfaceClass *ovs_interface_class)
+{
+	NMDeviceClass *device_class = NM_DEVICE_CLASS (ovs_interface_class);
+
+	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-interface.h b/libnm/nm-device-ovs-interface.h
new file mode 100644
index 0000000000..a49db559ae
--- /dev/null
+++ b/libnm/nm-device-ovs-interface.h
@@ -0,0 +1,45 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2017 Red Hat, Inc.
+ */
+
+#ifndef __NM_DEVICE_OVS_INTERFACE_H__
+#define __NM_DEVICE_OVS_INTERFACE_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only <NetworkManager.h> can be included directly."
+#endif
+
+#include "nm-device.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_DEVICE_OVS_INTERFACE            (nm_device_ovs_interface_get_type ())
+#define NM_DEVICE_OVS_INTERFACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_OVS_INTERFACE, NMDeviceOvsInterface))
+#define NM_DEVICE_OVS_INTERFACE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_OVS_INTERFACE, NMDeviceOvsInterfaceClass))
+#define NM_IS_DEVICE_OVS_INTERFACE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_OVS_INTERFACE))
+#define NM_IS_DEVICE_OVS_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_OVS_INTERFACE))
+#define NM_DEVICE_OVS_INTERFACE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_OVS_INTERFACE, NMDeviceOvsInterfaceClass))
+
+typedef struct _NMDeviceOvsInterfaceClass NMDeviceOvsInterfaceClass;
+
+NM_AVAILABLE_IN_1_10
+GType nm_device_ovs_interface_get_type (void);
+
+G_END_DECLS
+
+#endif /* __NM_DEVICE_OVS_INTERFACE_H__ */
diff --git a/libnm/nm-types.h b/libnm/nm-types.h
index 1e06d15feb..bc861f194b 100644
--- a/libnm/nm-types.h
+++ b/libnm/nm-types.h
@@ -26,35 +26,36 @@
 #include "nm-dbus-interface.h"
 #include "nm-connection.h"
 
-typedef struct _NMAccessPoint       NMAccessPoint;
-typedef struct _NMActiveConnection  NMActiveConnection;
-typedef struct _NMClient            NMClient;
-typedef struct _NMDevice            NMDevice;
-typedef struct _NMDeviceAdsl        NMDeviceAdsl;
-typedef struct _NMDeviceBond        NMDeviceBond;
-typedef struct _NMDeviceBridge      NMDeviceBridge;
-typedef struct _NMDeviceBt          NMDeviceBt;
-typedef struct _NMDeviceDummy       NMDeviceDummy;
-typedef struct _NMDeviceEthernet    NMDeviceEthernet;
-typedef struct _NMDeviceGeneric     NMDeviceGeneric;
-typedef struct _NMDeviceInfiniband  NMDeviceInfiniband;
-typedef struct _NMDeviceIPTunnel    NMDeviceIPTunnel;
-typedef struct _NMDeviceMacsec      NMDeviceMacsec;
-typedef struct _NMDeviceMacvlan     NMDeviceMacvlan;
-typedef struct _NMDeviceModem       NMDeviceModem;
-typedef struct _NMDeviceOlpcMesh    NMDeviceOlpcMesh;
-typedef struct _NMDevicePpp         NMDevicePpp;
-typedef struct _NMDeviceTeam        NMDeviceTeam;
-typedef struct _NMDeviceTun         NMDeviceTun;
-typedef struct _NMDeviceVlan        NMDeviceVlan;
-typedef struct _NMDeviceVxlan       NMDeviceVxlan;
-typedef struct _NMDeviceWifi        NMDeviceWifi;
-typedef struct _NMDeviceWimax       NMDeviceWimax;
-typedef struct _NMDhcpConfig        NMDhcpConfig;
-typedef struct _NMIPConfig          NMIPConfig;
-typedef struct _NMObject            NMObject;
-typedef struct _NMRemoteConnection  NMRemoteConnection;
-typedef struct _NMVpnConnection     NMVpnConnection;
-typedef struct _NMWimaxNsp          NMWimaxNsp;
+typedef struct _NMAccessPoint        NMAccessPoint;
+typedef struct _NMActiveConnection   NMActiveConnection;
+typedef struct _NMClient             NMClient;
+typedef struct _NMDevice             NMDevice;
+typedef struct _NMDeviceAdsl         NMDeviceAdsl;
+typedef struct _NMDeviceBond         NMDeviceBond;
+typedef struct _NMDeviceBridge       NMDeviceBridge;
+typedef struct _NMDeviceBt           NMDeviceBt;
+typedef struct _NMDeviceDummy        NMDeviceDummy;
+typedef struct _NMDeviceEthernet     NMDeviceEthernet;
+typedef struct _NMDeviceGeneric      NMDeviceGeneric;
+typedef struct _NMDeviceInfiniband   NMDeviceInfiniband;
+typedef struct _NMDeviceIPTunnel     NMDeviceIPTunnel;
+typedef struct _NMDeviceMacsec       NMDeviceMacsec;
+typedef struct _NMDeviceMacvlan      NMDeviceMacvlan;
+typedef struct _NMDeviceModem        NMDeviceModem;
+typedef struct _NMDeviceOlpcMesh     NMDeviceOlpcMesh;
+typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface;
+typedef struct _NMDevicePpp          NMDevicePpp;
+typedef struct _NMDeviceTeam         NMDeviceTeam;
+typedef struct _NMDeviceTun          NMDeviceTun;
+typedef struct _NMDeviceVlan         NMDeviceVlan;
+typedef struct _NMDeviceVxlan        NMDeviceVxlan;
+typedef struct _NMDeviceWifi         NMDeviceWifi;
+typedef struct _NMDeviceWimax        NMDeviceWimax;
+typedef struct _NMDhcpConfig         NMDhcpConfig;
+typedef struct _NMIPConfig           NMIPConfig;
+typedef struct _NMObject             NMObject;
+typedef struct _NMRemoteConnection   NMRemoteConnection;
+typedef struct _NMVpnConnection      NMVpnConnection;
+typedef struct _NMWimaxNsp           NMWimaxNsp;
 
 #endif  /* NM_TYPES_H */