mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
libnm: add support for ovs-port devices
This commit is contained in:
parent
e5c19377ec
commit
c536d7e666
|
@ -752,6 +752,7 @@ libnm_lib_h_pub_real = \
|
||||||
libnm/nm-device-modem.h \
|
libnm/nm-device-modem.h \
|
||||||
libnm/nm-device-olpc-mesh.h \
|
libnm/nm-device-olpc-mesh.h \
|
||||||
libnm/nm-device-ovs-interface.h \
|
libnm/nm-device-ovs-interface.h \
|
||||||
|
libnm/nm-device-ovs-port.h \
|
||||||
libnm/nm-device-ppp.h \
|
libnm/nm-device-ppp.h \
|
||||||
libnm/nm-device-team.h \
|
libnm/nm-device-team.h \
|
||||||
libnm/nm-device-tun.h \
|
libnm/nm-device-tun.h \
|
||||||
|
@ -806,6 +807,7 @@ libnm_lib_c_real = \
|
||||||
libnm/nm-device-modem.c \
|
libnm/nm-device-modem.c \
|
||||||
libnm/nm-device-olpc-mesh.c \
|
libnm/nm-device-olpc-mesh.c \
|
||||||
libnm/nm-device-ovs-interface.c \
|
libnm/nm-device-ovs-interface.c \
|
||||||
|
libnm/nm-device-ovs-port.c \
|
||||||
libnm/nm-device-ppp.c \
|
libnm/nm-device-ppp.c \
|
||||||
libnm/nm-device-team.c \
|
libnm/nm-device-team.c \
|
||||||
libnm/nm-device-tun.c \
|
libnm/nm-device-tun.c \
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
#include "nm-device-modem.h"
|
#include "nm-device-modem.h"
|
||||||
#include "nm-device-olpc-mesh.h"
|
#include "nm-device-olpc-mesh.h"
|
||||||
#include "nm-device-ovs-interface.h"
|
#include "nm-device-ovs-interface.h"
|
||||||
|
#include "nm-device-ovs-port.h"
|
||||||
#include "nm-device-team.h"
|
#include "nm-device-team.h"
|
||||||
#include "nm-device-tun.h"
|
#include "nm-device-tun.h"
|
||||||
#include "nm-device-vlan.h"
|
#include "nm-device-vlan.h"
|
||||||
|
|
|
@ -1187,6 +1187,7 @@ global:
|
||||||
nm_client_connectivity_check_set_enabled;
|
nm_client_connectivity_check_set_enabled;
|
||||||
nm_device_dummy_get_hw_address;
|
nm_device_dummy_get_hw_address;
|
||||||
nm_device_ovs_interface_get_type;
|
nm_device_ovs_interface_get_type;
|
||||||
|
nm_device_ovs_port_get_type;
|
||||||
nm_device_ppp_get_type;
|
nm_device_ppp_get_type;
|
||||||
nm_ip_route_equal_full;
|
nm_ip_route_equal_full;
|
||||||
nm_setting_bridge_get_group_forward_mask;
|
nm_setting_bridge_get_group_forward_mask;
|
||||||
|
|
|
@ -64,6 +64,7 @@
|
||||||
#include "nm-device-modem.h"
|
#include "nm-device-modem.h"
|
||||||
#include "nm-device-olpc-mesh.h"
|
#include "nm-device-olpc-mesh.h"
|
||||||
#include "nm-device-ovs-interface.h"
|
#include "nm-device-ovs-interface.h"
|
||||||
|
#include "nm-device-ovs-port.h"
|
||||||
#include "nm-device-ppp.h"
|
#include "nm-device-ppp.h"
|
||||||
#include "nm-device-team.h"
|
#include "nm-device-team.h"
|
||||||
#include "nm-device-tun.h"
|
#include "nm-device-tun.h"
|
||||||
|
@ -2150,6 +2151,8 @@ obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager
|
||||||
type = NM_TYPE_DEVICE_OLPC_MESH;
|
type = NM_TYPE_DEVICE_OLPC_MESH;
|
||||||
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE) == 0)
|
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE) == 0)
|
||||||
type = NM_TYPE_DEVICE_OVS_INTERFACE;
|
type = NM_TYPE_DEVICE_OVS_INTERFACE;
|
||||||
|
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_OVS_PORT) == 0)
|
||||||
|
type = NM_TYPE_DEVICE_OVS_PORT;
|
||||||
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_PPP) == 0)
|
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_PPP) == 0)
|
||||||
type = NM_TYPE_DEVICE_PPP;
|
type = NM_TYPE_DEVICE_PPP;
|
||||||
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_TEAM) == 0)
|
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_TEAM) == 0)
|
||||||
|
|
95
libnm/nm-device-ovs-port.c
Normal file
95
libnm/nm-device-ovs-port.c
Normal file
|
@ -0,0 +1,95 @@
|
||||||
|
/*
|
||||||
|
* 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-port.h"
|
||||||
|
#include "nm-object-private.h"
|
||||||
|
#include "nm-setting-ovs-port.h"
|
||||||
|
#include "nm-setting-ovs-port.h"
|
||||||
|
#include "nm-setting-connection.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* NMDeviceOvsPort:
|
||||||
|
*/
|
||||||
|
struct _NMDeviceOvsPort {
|
||||||
|
NMDevice parent;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct _NMDeviceOvsPortClass {
|
||||||
|
NMDeviceClass parent;
|
||||||
|
};
|
||||||
|
|
||||||
|
G_DEFINE_TYPE (NMDeviceOvsPort, nm_device_ovs_port, NM_TYPE_DEVICE)
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static const char *
|
||||||
|
get_type_description (NMDevice *device)
|
||||||
|
{
|
||||||
|
return "ovs-port";
|
||||||
|
}
|
||||||
|
static gboolean
|
||||||
|
connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
|
||||||
|
{
|
||||||
|
const char *iface_name;
|
||||||
|
|
||||||
|
if (!NM_DEVICE_CLASS (nm_device_ovs_port_parent_class)->connection_compatible (device, connection, error))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
if (!nm_connection_is_type (connection, NM_SETTING_OVS_PORT_SETTING_NAME)) {
|
||||||
|
g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
|
||||||
|
_("The connection was not a ovs_port 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_PORT;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void
|
||||||
|
nm_device_ovs_port_init (NMDeviceOvsPort *device)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
nm_device_ovs_port_class_init (NMDeviceOvsPortClass *ovs_port_class)
|
||||||
|
{
|
||||||
|
NMDeviceClass *device_class = NM_DEVICE_CLASS (ovs_port_class);
|
||||||
|
|
||||||
|
device_class->get_type_description = get_type_description;
|
||||||
|
device_class->connection_compatible = connection_compatible;
|
||||||
|
device_class->get_setting_type = get_setting_type;
|
||||||
|
}
|
45
libnm/nm-device-ovs-port.h
Normal file
45
libnm/nm-device-ovs-port.h
Normal file
|
@ -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_PORT_H__
|
||||||
|
#define __NM_DEVICE_OVS_PORT_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_PORT (nm_device_ovs_port_get_type ())
|
||||||
|
#define NM_DEVICE_OVS_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_OVS_PORT, NMDeviceOvsPort))
|
||||||
|
#define NM_DEVICE_OVS_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_OVS_PORT, NMDeviceOvsPortClass))
|
||||||
|
#define NM_IS_DEVICE_OVS_PORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_OVS_PORT))
|
||||||
|
#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))
|
||||||
|
|
||||||
|
typedef struct _NMDeviceOvsPortClass NMDeviceOvsPortClass;
|
||||||
|
|
||||||
|
NM_AVAILABLE_IN_1_10
|
||||||
|
GType nm_device_ovs_port_get_type (void);
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
|
||||||
|
#endif /* __NM_DEVICE_OVS_PORT_H__ */
|
|
@ -44,6 +44,7 @@ typedef struct _NMDeviceMacvlan NMDeviceMacvlan;
|
||||||
typedef struct _NMDeviceModem NMDeviceModem;
|
typedef struct _NMDeviceModem NMDeviceModem;
|
||||||
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;
|
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;
|
||||||
typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface;
|
typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface;
|
||||||
|
typedef struct _NMDeviceOvsPort NMDeviceOvsPort;
|
||||||
typedef struct _NMDevicePpp NMDevicePpp;
|
typedef struct _NMDevicePpp NMDevicePpp;
|
||||||
typedef struct _NMDeviceTeam NMDeviceTeam;
|
typedef struct _NMDeviceTeam NMDeviceTeam;
|
||||||
typedef struct _NMDeviceTun NMDeviceTun;
|
typedef struct _NMDeviceTun NMDeviceTun;
|
||||||
|
|
|
@ -142,6 +142,7 @@ libnm/nm-device-macvlan.c
|
||||||
libnm/nm-device-modem.c
|
libnm/nm-device-modem.c
|
||||||
libnm/nm-device-olpc-mesh.c
|
libnm/nm-device-olpc-mesh.c
|
||||||
libnm/nm-device-ovs-interface.c
|
libnm/nm-device-ovs-interface.c
|
||||||
|
libnm/nm-device-ovs-port.c
|
||||||
libnm/nm-device-team.c
|
libnm/nm-device-team.c
|
||||||
libnm/nm-device-vlan.c
|
libnm/nm-device-vlan.c
|
||||||
libnm/nm-device-vxlan.c
|
libnm/nm-device-vxlan.c
|
||||||
|
|
Loading…
Reference in a new issue