[libvirt] [dbus PATCH v2 07/17] Implement Key property for StorageVol Interface

[Katerina Koukiou]

Signed-off-by: Katerina Koukiou <kkoukiou at redhat.com>
Reviewed-by: Ján Tomko <jtomko at redhat.com>
---
 data/org.libvirt.StorageVol.xml |  5 +++++
 src/storagevol.c                | 23 +++++++++++++++++++++++
 tests/test_storage.py           |  1 +
 3 files changed, 29 insertions(+)

diff --git a/data/org.libvirt.StorageVol.xml b/data/org.libvirt.StorageVol.xml
index 3110b4f..3b36f3b 100644
--- a/data/org.libvirt.StorageVol.xml
+++ b/data/org.libvirt.StorageVol.xml
@@ -8,5 +8,10 @@
           value="See https://libvirt.org/html/libvirt-libvirt-storage.html#virStorageVolGetName"/>
       <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
+    <property name="Key" type="s" access="read">
+      <annotation name="org.gtk.GDBus.DocString"
+          value="See https://libvirt.org/html/libvirt-libvirt-storage.html#virStorageVolGetKey"/>
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+    </property>
   </interface>
 </node>
diff --git a/src/storagevol.c b/src/storagevol.c
index 12ebef1..b979b82 100644
--- a/src/storagevol.c
+++ b/src/storagevol.c
@@ -46,8 +46,31 @@ virtDBusStorageVolGetName(const gchar *objectPath,
     *value = g_variant_new("s", name);
 }
 
+static void
+virtDBusStorageVolGetKey(const gchar *objectPath,
+                         gpointer userData,
+                         GVariant **value,
+                         GError **error)
+{
+    virtDBusConnect *connect = userData;
+    g_autoptr(virStorageVol) storageVol = NULL;
+    const gchar *key;
+
+    storageVol = virtDBusStorageVolGetVirStorageVol(connect, objectPath,
+                                                    error);
+    if (!storageVol)
+        return;
+
+    key = virStorageVolGetKey(storageVol);
+    if (!key)
+        return virtDBusUtilSetLastVirtError(error);
+
+    *value = g_variant_new("s", key);
+}
+
 static virtDBusGDBusPropertyTable virtDBusStorageVolPropertyTable[] = {
     { "Name", virtDBusStorageVolGetName, NULL },
+    { "Key", virtDBusStorageVolGetKey, NULL },
     { 0 }
 };
 
diff --git a/tests/test_storage.py b/tests/test_storage.py
index c93b800..91b2597 100755
--- a/tests/test_storage.py
+++ b/tests/test_storage.py
@@ -138,6 +138,7 @@ class TestStorageVolume(libvirttest.BaseTestClass):
 
         props = obj.GetAll('org.libvirt.StorageVol',
                            dbus_interface=dbus.PROPERTIES_IFACE)
+        assert isinstance(props['Key'], dbus.String)
         assert isinstance(props['Name'], dbus.String)
 
 
-- 
2.15.0