From 734f45e0e01b3c415bee2a4b62bb27c5092e170d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 23 Feb 2016 15:23:22 +0100 Subject: [PATCH 1/3] doc: update introspection/all.xml to include missing nm-device xmls --- introspection/all.xml.in | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/introspection/all.xml.in b/introspection/all.xml.in index 29cccdb520..273c0fda4d 100644 --- a/introspection/all.xml.in +++ b/introspection/all.xml.in @@ -6,7 +6,7 @@ @VERSION@ -Copyright (C) 2008 - 2011 Red Hat, Inc. +Copyright (C) 2008 - 2016 Red Hat, Inc. Copyright (C) 2008 - 2009 Novell, Inc. @@ -28,19 +28,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - - - - + - + + + + + + + + + + - + + + From 71962881a84b3ea8f72d074f610e26fb35129524 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 23 Feb 2016 15:24:32 +0100 Subject: [PATCH 2/3] examples: add missing device-types to examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based-on-patch-by: Jiří Klimeš --- examples/python/dbus/list-devices.py | 4 ++++ examples/ruby/list-devices.rb | 6 +++++- examples/shell/list-devices.sh | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/examples/python/dbus/list-devices.py b/examples/python/dbus/list-devices.py index b8e0058be5..c9c753ec8b 100755 --- a/examples/python/dbus/list-devices.py +++ b/examples/python/dbus/list-devices.py @@ -36,6 +36,10 @@ devtypes = { 1: "Ethernet", 13: "Bridge", 14: "Generic", 15: "Team" + 16: "TUN" + 17: "IPTunnel" + 18: "MACVLAN" + 19: "VXLAN" } states = { 0: "Unknown", diff --git a/examples/ruby/list-devices.rb b/examples/ruby/list-devices.rb index 710ccedc08..9949a40977 100755 --- a/examples/ruby/list-devices.rb +++ b/examples/ruby/list-devices.rb @@ -38,7 +38,11 @@ devtypes = { 1 => "Ethernet", 12 => "ADSL", 13 => "Bridge", 14 => "Generic", - 15 => "Team" + 15 => "Team", + 16 => "TUN", + 17 => "IPTunnel", + 18 => "MACVLAN", + 19 => "VXLAN", } states = { 0 => "Unknown", diff --git a/examples/shell/list-devices.sh b/examples/shell/list-devices.sh index dba82261c0..817c8b7cc4 100755 --- a/examples/shell/list-devices.sh +++ b/examples/shell/list-devices.sh @@ -48,6 +48,10 @@ devtype_to_name() 13) echo "Bridge" ;; 14) echo "Generic" ;; 15) echo "Team" ;; + 16) echo "TUN" ;; + 17) echo "IPTunnel" ;; + 18) echo "MACVLAN" ;; + 19) echo "VXLAN" ;; *) echo "Unknown" ;; esac } From 8852b219a25025cb9f4e0623bda819bfb615005c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 23 Feb 2016 15:26:37 +0100 Subject: [PATCH 3/3] libnm-util: add missing device types to NMDeviceType MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Althoug we don't fully backport the new device types, at least add the types to the NMDeviceType enum. Based-on-patch-by: Jiří Klimeš --- libnm-util/NetworkManager.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index 8101082b77..8b083b91bf 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -153,6 +153,8 @@ typedef enum { * @NM_DEVICE_TYPE_TEAM: a team master interface * @NM_DEVICE_TYPE_TUN: a TUN/TAP interface * @NM_DEVICE_TYPE_IP_TUNNEL: an IP tunnel interface + * @NM_DEVICE_TYPE_MACVLAN: a MACVLAN interface + * @NM_DEVICE_TYPE_VXLAN: a VXLAN interface * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. @@ -178,6 +180,8 @@ typedef enum { NM_DEVICE_TYPE_TEAM = 15, NM_DEVICE_TYPE_TUN = 16, NM_DEVICE_TYPE_IP_TUNNEL = 17, + NM_DEVICE_TYPE_MACVLAN = 18, + NM_DEVICE_TYPE_VXLAN = 19, } NMDeviceType; /**