From 6748c44cb66d6d9e631a91c9c86958acfcd6806f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 2 Oct 2017 08:39:09 +0200
Subject: [PATCH] introspection: add o.fd.NM.Device.OvsPort interface

---
 Makefile.am                                   |  4 ++++
 ...edesktop.NetworkManager.Device.OvsPort.xml | 20 +++++++++++++++++++
 libnm-core/nm-dbus-interface.h                |  3 +++
 libnm/nm-device.c                             |  3 +++
 src/devices/nm-device.c                       |  1 +
 5 files changed, 31 insertions(+)
 create mode 100644 introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml

diff --git a/Makefile.am b/Makefile.am
index 4ed5a4f990..351862565a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -208,6 +208,8 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.h \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.h \
+	introspection/org.freedesktop.NetworkManager.Device.OvsPort.c \
+	introspection/org.freedesktop.NetworkManager.Device.OvsPort.h \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.c \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.h \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.c \
@@ -284,6 +286,7 @@ DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Ppp.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
@@ -333,6 +336,7 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.xml \
+	introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Team.xml \
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
new file mode 100644
index 0000000000..d4900f510c
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.OvsPort:
+      @short_description: OvsPort Device
+
+  -->
+  <interface name="org.freedesktop.NetworkManager.Device.OvsPort">
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+
+        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
+    -->
+    <signal name="PropertiesChanged">
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+  </interface>
+</node>
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 7fb75d4f79..1a5daf9797 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -47,6 +47,7 @@
 #define NM_DBUS_INTERFACE_DEVICE_BLUETOOTH     NM_DBUS_INTERFACE_DEVICE ".Bluetooth"
 #define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH     NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
 #define NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE NM_DBUS_INTERFACE_DEVICE ".OvsInterface"
+#define NM_DBUS_INTERFACE_DEVICE_OVS_PORT      NM_DBUS_INTERFACE_DEVICE ".OvsPort"
 #define NM_DBUS_PATH_ACCESS_POINT              NM_DBUS_PATH "/AccessPoint"
 #define NM_DBUS_INTERFACE_ACCESS_POINT         NM_DBUS_INTERFACE ".AccessPoint"
 #define NM_DBUS_INTERFACE_DEVICE_MODEM         NM_DBUS_INTERFACE_DEVICE ".Modem"
@@ -207,6 +208,7 @@ typedef enum {
  * @NM_DEVICE_TYPE_DUMMY: a dummy interface
  * @NM_DEVICE_TYPE_PPP: a PPP interface
  * @NM_DEVICE_TYPE_OVS_INTERFACE: a OpenVSwitch interface
+ * @NM_DEVICE_TYPE_OVS_PORT: a OpenVSwitch port
  *
  * #NMDeviceType values indicate the type of hardware represented by a
  * device object.
@@ -237,6 +239,7 @@ typedef enum {
 	NM_DEVICE_TYPE_DUMMY         = 22,
 	NM_DEVICE_TYPE_PPP           = 23,
 	NM_DEVICE_TYPE_OVS_INTERFACE = 24,
+	NM_DEVICE_TYPE_OVS_PORT      = 25,
 } NMDeviceType;
 
 /**
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 96efbc348e..6f972c6fac 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -262,6 +262,7 @@ coerce_type (NMDeviceType type)
 	case NM_DEVICE_TYPE_BT:
 	case NM_DEVICE_TYPE_OLPC_MESH:
 	case NM_DEVICE_TYPE_OVS_INTERFACE:
+	case NM_DEVICE_TYPE_OVS_PORT:
 	case NM_DEVICE_TYPE_WIMAX:
 	case NM_DEVICE_TYPE_MODEM:
 	case NM_DEVICE_TYPE_INFINIBAND:
@@ -1525,6 +1526,8 @@ get_type_name (NMDevice *device)
 		return _("OLPC Mesh");
 	case NM_DEVICE_TYPE_OVS_INTERFACE:
 		return _("OpenVSwitch Interface");
+	case NM_DEVICE_TYPE_OVS_PORT:
+		return _("OpenVSwitch Port");
 	case NM_DEVICE_TYPE_WIMAX:
 		return _("WiMAX");
 	case NM_DEVICE_TYPE_MODEM:
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 8106b4e95c..4f7e46d347 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1662,6 +1662,7 @@ _get_route_metric_default (NMDevice *self)
 	case NM_DEVICE_TYPE_BT:
 		return 750;
 	case NM_DEVICE_TYPE_OVS_INTERFACE:
+	case NM_DEVICE_TYPE_OVS_PORT:
 		return 800;
 	case NM_DEVICE_TYPE_GENERIC:
 		return 950;