core: introduce device::ports property

The property `PROP_PORTS` should be of type g_param_spec_variant() with
variant 'ao'. This way the variant can be cached.

The deprecated property 'device::slaves' in
'src/core/devices/nm-device.c' must have the same getter-implementation,
returning the same GVariant instance.

Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>

6 files changed, 30 insertions, 10 deletions

diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
index 26611aae59..e29dee45c8 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
@@ -30,8 +30,9 @@ n
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently enslaved to
-        this device.
+        DEPRECATED. Use the "Ports" property in
+        "org.freedesktop.NetworkManager.Device" instead which exists since
+        version NetworkManager 1.34.0.
     -->
     <property name="Slaves" type="ao" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
index 379e702a47..ee0a9c5058 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
@@ -30,8 +30,10 @@ n
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently enslaved to
-        this device.
+        DEPRECATED. Use the "Ports" property in
+        "org.freedesktop.NetworkManager.Device" instead which exists since
+        version NetworkManager 1.34.0.
+
     -->
     <property name="Slaves" type="ao" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
index ff58bd9527..5970a59d6a 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
@@ -10,8 +10,9 @@
     <!--
         Slaves:
 
-        Array of object paths representing ports which are currently enslaved to
-        this bridge.
+        DEPRECATED. Use the "Ports" property in
+        "org.freedesktop.NetworkManager.Device" instead which exists since
+        version NetworkManager 1.34.0.
 
         Since: 1.14
     -->
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
index b43080378e..3cd1fa54d6 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
@@ -10,8 +10,9 @@
     <!--
         Slaves:
 
-        Array of object paths representing interfaces which are currently enslaved to
-        this port.
+        DEPRECATED. Use the "Ports" property in
+        "org.freedesktop.NetworkManager.Device" instead which exists since
+        version NetworkManager 1.34.0.
 
         Since: 1.14
     -->
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Team.xml b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
index bbae316b1d..0634d87990 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Team.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
@@ -30,8 +30,10 @@ n
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently enslaved to
-        this device.
+        DEPRECATED. Use the "Ports" property in
+        "org.freedesktop.NetworkManager.Device" instead which exists since
+        version NetworkManager 1.34.0.
+
     -->
     <property name="Slaves" type="ao" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index 32945bcb38..82f127edde 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -311,6 +311,19 @@
     <property name="HwAddress" type="s" access="read"/>
 
     <!--
+        Ports:
+
+        The port devices of the controller device.
+
+        Array of object paths representing devices which are currently set as
+        port of this device. This replaces the 'Slaves' properties on the
+        device-specific D-Bus interfaces.
+
+        Since: 1.34
+    -->
+    <property name="Ports" type="ao" access="read"/>
+
+    <!--
         Reapply:
         @connection: The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarily differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.
         @version_id: If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply.