mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-06 16:21:50 +00:00
libnm: add support for ovs-bridge devices
This commit is contained in:
parent
c536d7e666
commit
3f74528a0b
|
@ -753,6 +753,7 @@ libnm_lib_h_pub_real = \
|
|||
libnm/nm-device-olpc-mesh.h \
|
||||
libnm/nm-device-ovs-interface.h \
|
||||
libnm/nm-device-ovs-port.h \
|
||||
libnm/nm-device-ovs-bridge.h \
|
||||
libnm/nm-device-ppp.h \
|
||||
libnm/nm-device-team.h \
|
||||
libnm/nm-device-tun.h \
|
||||
|
@ -808,6 +809,7 @@ libnm_lib_c_real = \
|
|||
libnm/nm-device-olpc-mesh.c \
|
||||
libnm/nm-device-ovs-interface.c \
|
||||
libnm/nm-device-ovs-port.c \
|
||||
libnm/nm-device-ovs-bridge.c \
|
||||
libnm/nm-device-ppp.c \
|
||||
libnm/nm-device-team.c \
|
||||
libnm/nm-device-tun.c \
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
#include "nm-device-olpc-mesh.h"
|
||||
#include "nm-device-ovs-interface.h"
|
||||
#include "nm-device-ovs-port.h"
|
||||
#include "nm-device-ovs-bridge.h"
|
||||
#include "nm-device-team.h"
|
||||
#include "nm-device-tun.h"
|
||||
#include "nm-device-vlan.h"
|
||||
|
|
|
@ -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_bridge_get_type;
|
||||
nm_device_ovs_interface_get_type;
|
||||
nm_device_ovs_port_get_type;
|
||||
nm_device_ppp_get_type;
|
||||
|
|
|
@ -65,6 +65,7 @@
|
|||
#include "nm-device-olpc-mesh.h"
|
||||
#include "nm-device-ovs-interface.h"
|
||||
#include "nm-device-ovs-port.h"
|
||||
#include "nm-device-ovs-bridge.h"
|
||||
#include "nm-device-ppp.h"
|
||||
#include "nm-device-team.h"
|
||||
#include "nm-device-tun.h"
|
||||
|
@ -2153,6 +2154,8 @@ obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager
|
|||
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_OVS_BRIDGE) == 0)
|
||||
type = NM_TYPE_DEVICE_OVS_BRIDGE;
|
||||
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)
|
||||
|
|
96
libnm/nm-device-ovs-bridge.c
Normal file
96
libnm/nm-device-ovs-bridge.c
Normal file
|
@ -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-bridge.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-setting-ovs-bridge.h"
|
||||
#include "nm-setting-ovs-port.h"
|
||||
#include "nm-setting-connection.h"
|
||||
|
||||
/**
|
||||
* NMDeviceOvsBridge:
|
||||
*/
|
||||
struct _NMDeviceOvsBridge {
|
||||
NMDevice parent;
|
||||
};
|
||||
|
||||
struct _NMDeviceOvsBridgeClass {
|
||||
NMDeviceClass parent;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (NMDeviceOvsBridge, nm_device_ovs_bridge, NM_TYPE_DEVICE)
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static const char *
|
||||
get_type_description (NMDevice *device)
|
||||
{
|
||||
return "ovs-bridge";
|
||||
}
|
||||
|
||||
static gboolean
|
||||
connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
|
||||
{
|
||||
const char *iface_name;
|
||||
|
||||
if (!NM_DEVICE_CLASS (nm_device_ovs_bridge_parent_class)->connection_compatible (device, connection, error))
|
||||
return FALSE;
|
||||
|
||||
if (!nm_connection_is_type (connection, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) {
|
||||
g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
|
||||
_("The connection was not a ovs_bridge 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_BRIDGE;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static void
|
||||
nm_device_ovs_bridge_init (NMDeviceOvsBridge *device)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
nm_device_ovs_bridge_class_init (NMDeviceOvsBridgeClass *ovs_bridge_class)
|
||||
{
|
||||
NMDeviceClass *device_class = NM_DEVICE_CLASS (ovs_bridge_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-bridge.h
Normal file
45
libnm/nm-device-ovs-bridge.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_BRIDGE_H__
|
||||
#define __NM_DEVICE_OVS_BRIDGE_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_BRIDGE (nm_device_ovs_bridge_get_type ())
|
||||
#define NM_DEVICE_OVS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_OVS_BRIDGE, NMDeviceOvsBridge))
|
||||
#define NM_DEVICE_OVS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_OVS_BRIDGE, NMDeviceOvsBridgeClass))
|
||||
#define NM_IS_DEVICE_OVS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_OVS_BRIDGE))
|
||||
#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))
|
||||
|
||||
typedef struct _NMDeviceOvsBridgeClass NMDeviceOvsBridgeClass;
|
||||
|
||||
NM_AVAILABLE_IN_1_10
|
||||
GType nm_device_ovs_bridge_get_type (void);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __NM_DEVICE_OVS_BRIDGE_H__ */
|
|
@ -43,6 +43,7 @@ typedef struct _NMDeviceMacsec NMDeviceMacsec;
|
|||
typedef struct _NMDeviceMacvlan NMDeviceMacvlan;
|
||||
typedef struct _NMDeviceModem NMDeviceModem;
|
||||
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;
|
||||
typedef struct _NMDeviceOvsBridge NMDeviceOvsBridge;
|
||||
typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface;
|
||||
typedef struct _NMDeviceOvsPort NMDeviceOvsPort;
|
||||
typedef struct _NMDevicePpp NMDevicePpp;
|
||||
|
|
|
@ -141,6 +141,7 @@ libnm/nm-device-ip-tunnel.c
|
|||
libnm/nm-device-macvlan.c
|
||||
libnm/nm-device-modem.c
|
||||
libnm/nm-device-olpc-mesh.c
|
||||
libnm/nm-device-ovs-bridge.c
|
||||
libnm/nm-device-ovs-interface.c
|
||||
libnm/nm-device-ovs-port.c
|
||||
libnm/nm-device-team.c
|
||||
|
|
Loading…
Reference in a new issue