system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 12:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

contrib/rpm: Use Open vSwitch instead of OpenVSwitch

Browse source 
The correct naming is Open vSwitch so use it instead of OpenVSwitch

[lkundrak@v3.sk: added some more cases of the same]

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

Fixes: 830a5a14cb
This commit is contained in:
Timothy Redaelli 2018-06-27 16:53:05 +02:00 committed by Lubomir Rintel
parent a5a2a92618
commit 9be0c3330d
8 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/fedora/rpm/NetworkManager.spec
View file

@ -289,13 +289,13 @@ devices.
%if %{with ovs} %if %{with ovs}
%package ovs %package ovs
Summary: OpenVSwitch device plugin for NetworkManager Summary: Open vSwitch device plugin for NetworkManager
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: openvswitch Requires: openvswitch
%description ovs %description ovs
This package contains NetworkManager support for OpenVSwitch bridges. This package contains NetworkManager support for Open vSwitch bridges.
%endif %endif

8
libnm-core/nm-dbus-interface.h
View file

@ -211,9 +211,9 @@ typedef enum {
* @NM_DEVICE_TYPE_MACSEC: a MACsec interface * @NM_DEVICE_TYPE_MACSEC: a MACsec interface
* @NM_DEVICE_TYPE_DUMMY: a dummy interface * @NM_DEVICE_TYPE_DUMMY: a dummy interface
* @NM_DEVICE_TYPE_PPP: a PPP interface * @NM_DEVICE_TYPE_PPP: a PPP interface
* @NM_DEVICE_TYPE_OVS_INTERFACE: a OpenVSwitch interface * @NM_DEVICE_TYPE_OVS_INTERFACE: a Open vSwitch interface
* @NM_DEVICE_TYPE_OVS_PORT: a OpenVSwitch port * @NM_DEVICE_TYPE_OVS_PORT: a Open vSwitch port
* @NM_DEVICE_TYPE_OVS_BRIDGE: a OpenVSwitch bridge * @NM_DEVICE_TYPE_OVS_BRIDGE: a Open vSwitch bridge
* @NM_DEVICE_TYPE_WPAN: a IEEE 802.15.4 (WPAN) MAC Layer Device * @NM_DEVICE_TYPE_WPAN: a IEEE 802.15.4 (WPAN) MAC Layer Device
* @NM_DEVICE_TYPE_6LOWPAN: 6LoWPAN interface * @NM_DEVICE_TYPE_6LOWPAN: 6LoWPAN interface
* *
@ -556,7 +556,7 @@ typedef enum {
* @NM_DEVICE_STATE_REASON_NEW_ACTIVATION: New connection activation was enqueued * @NM_DEVICE_STATE_REASON_NEW_ACTIVATION: New connection activation was enqueued
* @NM_DEVICE_STATE_REASON_PARENT_CHANGED: the device's parent changed * @NM_DEVICE_STATE_REASON_PARENT_CHANGED: the device's parent changed
* @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed
* @NM_DEVICE_STATE_REASON_OVSDB_FAILED: problem communicating with OpenVSwitch database * @NM_DEVICE_STATE_REASON_OVSDB_FAILED: problem communicating with Open vSwitch database
* @NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: a duplicate IP address was detected * @NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: a duplicate IP address was detected
* @NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: The selected IP method is not supported * @NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: The selected IP method is not supported
* *

4
libnm-core/nm-setting-ovs-bridge.c
View file

@ -28,10 +28,10 @@
/** /**
* SECTION:nm-setting-ovs-bridge * SECTION:nm-setting-ovs-bridge
* @short_description: Describes connection properties for OpenVSwitch bridges. * @short_description: Describes connection properties for Open vSwitch bridges.
* *
* The #NMSettingOvsBridge object is a #NMSetting subclass that describes properties * The #NMSettingOvsBridge object is a #NMSetting subclass that describes properties
* necessary for OpenVSwitch bridges. * necessary for Open vSwitch bridges.
**/ **/
enum { enum {

6
libnm-core/nm-setting-ovs-interface.c
View file

@ -27,10 +27,10 @@
/** /**
* SECTION:nm-setting-ovs-interface * SECTION:nm-setting-ovs-interface
* @short_description: Describes connection properties for OpenVSwitch interfaces. * @short_description: Describes connection properties for Open vSwitch interfaces.
* *
* The #NMSettingOvsInterface object is a #NMSetting subclass that describes properties * The #NMSettingOvsInterface object is a #NMSetting subclass that describes properties
* necessary for OpenVSwitch interfaces. * necessary for Open vSwitch interfaces.
**/ **/
enum { enum {
@ -42,7 +42,7 @@ enum {
/** /**
* NMSettingOvsInterface: * NMSettingOvsInterface:
* *
* OpenVSwitch Interface Settings * Open vSwitch Interface Settings
*/ */
struct _NMSettingOvsInterface { struct _NMSettingOvsInterface {
NMSetting parent; NMSetting parent;

6
libnm-core/nm-setting-ovs-patch.c
View file

@ -28,10 +28,10 @@
/** /**
* SECTION:nm-setting-ovs-patch * SECTION:nm-setting-ovs-patch
* @short_description: Describes connection properties for OpenVSwitch patch interfaces. * @short_description: Describes connection properties for Open vSwitch patch interfaces.
* *
* The #NMSettingOvsPatch object is a #NMSetting subclass that describes properties * The #NMSettingOvsPatch object is a #NMSetting subclass that describes properties
* necessary for OpenVSwitch interfaces of type "patch". * necessary for Open vSwitch interfaces of type "patch".
**/ **/
enum { enum {
@ -195,7 +195,7 @@ nm_setting_ovs_patch_class_init (NMSettingOvsPatchClass *setting_class)
/** /**
* NMSettingOvsPatch:peer: * NMSettingOvsPatch:peer:
* *
* Specifies the unicast destination IP address of a remote OpenVSwitch * Specifies the unicast destination IP address of a remote Open vSwitch
* bridge port to connect to. * bridge port to connect to.
* *
* Since: 1.10 * Since: 1.10

4
libnm-core/nm-setting-ovs-port.c
View file

@ -28,10 +28,10 @@
/** /**
* SECTION:nm-setting-ovs-port * SECTION:nm-setting-ovs-port
* @short_description: Describes connection properties for OpenVSwitch ports. * @short_description: Describes connection properties for Open vSwitch ports.
* *
* The #NMSettingOvsPort object is a #NMSetting subclass that describes properties * The #NMSettingOvsPort object is a #NMSetting subclass that describes properties
* necessary for OpenVSwitch ports. * necessary for Open vSwitch ports.
**/ **/
enum { enum {

6
libnm/nm-device.c
View file

@ -1310,11 +1310,11 @@ get_type_name (NMDevice *device)
case NM_DEVICE_TYPE_OLPC_MESH: case NM_DEVICE_TYPE_OLPC_MESH:
return _("OLPC Mesh"); return _("OLPC Mesh");
case NM_DEVICE_TYPE_OVS_INTERFACE: case NM_DEVICE_TYPE_OVS_INTERFACE:
return _("OpenVSwitch Interface"); return _("Open vSwitch Interface");
case NM_DEVICE_TYPE_OVS_PORT: case NM_DEVICE_TYPE_OVS_PORT:
return _("OpenVSwitch Port"); return _("Open vSwitch Port");
case NM_DEVICE_TYPE_OVS_BRIDGE: case NM_DEVICE_TYPE_OVS_BRIDGE:
return _("OpenVSwitch Bridge"); return _("Open vSwitch Bridge");
case NM_DEVICE_TYPE_WIMAX: case NM_DEVICE_TYPE_WIMAX:
return _("WiMAX"); return _("WiMAX");
case NM_DEVICE_TYPE_MODEM: case NM_DEVICE_TYPE_MODEM:

6
src/devices/ovs/nm-ovs-factory.c
View file

@ -80,14 +80,14 @@ new_device_from_type (const char *name, NMDeviceType device_type)
if (device_type == NM_DEVICE_TYPE_OVS_INTERFACE) { if (device_type == NM_DEVICE_TYPE_OVS_INTERFACE) {
type = NM_TYPE_DEVICE_OVS_INTERFACE; type = NM_TYPE_DEVICE_OVS_INTERFACE;
type_desc = "OpenVSwitch Interface"; type_desc = "Open vSwitch Interface";
link_type = NM_LINK_TYPE_OPENVSWITCH; link_type = NM_LINK_TYPE_OPENVSWITCH;
} else if (device_type == NM_DEVICE_TYPE_OVS_PORT) { } else if (device_type == NM_DEVICE_TYPE_OVS_PORT) {
type = NM_TYPE_DEVICE_OVS_PORT; type = NM_TYPE_DEVICE_OVS_PORT;
type_desc = "OpenVSwitch Port"; type_desc = "Open vSwitch Port";
} else if (device_type == NM_DEVICE_TYPE_OVS_BRIDGE) { } else if (device_type == NM_DEVICE_TYPE_OVS_BRIDGE) {
type = NM_TYPE_DEVICE_OVS_BRIDGE; type = NM_TYPE_DEVICE_OVS_BRIDGE;
type_desc = "OpenVSwitch Bridge"; type_desc = "Open vSwitch Bridge";
} else { } else {
return NULL; return NULL;
} }