From nobody Wed May 14 03:08:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528992047310985.1602477968092; Thu, 14 Jun 2018 09:00:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6F323D084B; Thu, 14 Jun 2018 16:00:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0698E2016A82; Thu, 14 Jun 2018 16:00:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 76BB84CA84; Thu, 14 Jun 2018 16:00:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5EG0AGj003868 for ; Thu, 14 Jun 2018 12:00:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id B359710FFE52; Thu, 14 Jun 2018 16:00:10 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57A3010FFE4D for ; Thu, 14 Jun 2018 16:00:10 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 14 Jun 2018 17:59:53 +0200 Message-Id: <20180614155953.30292-18-kkoukiou@redhat.com> In-Reply-To: <20180614155953.30292-1-kkoukiou@redhat.com> References: <20180614155953.30292-1-kkoukiou@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 17/17] Implement StorageVolCreateXMLFrom method for StoragePool Interface X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 14 Jun 2018 16:00:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Katerina Koukiou Reviewed-by: J=C3=A1n Tomko --- data/org.libvirt.StoragePool.xml | 9 +++++++++ src/storagepool.c | 41 ++++++++++++++++++++++++++++++++++++= ++++ tests/test_storage.py | 22 +++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/data/org.libvirt.StoragePool.xml b/data/org.libvirt.StoragePoo= l.xml index 161ade5..0a324e6 100644 --- a/data/org.libvirt.StoragePool.xml +++ b/data/org.libvirt.StoragePool.xml @@ -75,6 +75,15 @@ + + + + + + + diff --git a/src/storagepool.c b/src/storagepool.c index ee2862b..6eb6f27 100644 --- a/src/storagepool.c +++ b/src/storagepool.c @@ -400,6 +400,46 @@ virtDBusStoragePoolStorageVolCreateXML(GVariant *inArg= s, *outArgs =3D g_variant_new("(o)", path); } =20 +static void +virtDBusStoragePoolStorageVolCreateXMLFrom(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSE= D, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNU= SED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virStoragePool) storagePool =3D NULL; + g_autoptr(virStorageVol) storageVol =3D NULL; + g_autoptr(virStorageVol) storageVolOld =3D NULL; + const gchar *key; + const gchar *xml; + guint flags; + g_autofree gchar *path =3D NULL; + + g_variant_get(inArgs, "(&s&su)", &xml, &key, &flags); + + storagePool =3D virtDBusStoragePoolGetVirStoragePool(connect, objectPa= th, + error); + if (!storagePool) + return; + + storageVolOld =3D virStorageVolLookupByKey(connect->connection, key); + if (!storageVolOld) + return virtDBusUtilSetLastVirtError(error); + + storageVol =3D virStorageVolCreateXMLFrom(storagePool, xml, storageVol= Old, + flags); + if (!storageVol) + return virtDBusUtilSetLastVirtError(error); + + path =3D virtDBusUtilBusPathForVirStorageVol(storageVol, + connect->storageVolPath); + + *outArgs =3D g_variant_new("(o)", path); +} + static void virtDBusStoragePoolStorageVolLookupByName(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -474,6 +514,7 @@ static virtDBusGDBusMethodTable virtDBusStoragePoolMeth= odTable[] =3D { { "ListStorageVolumes", virtDBusStoragePoolListStorageVolumes }, { "Refresh", virtDBusStoragePoolRefresh }, { "StorageVolCreateXML", virtDBusStoragePoolStorageVolCreateXML }, + { "StorageVolCreateXMLFrom", virtDBusStoragePoolStorageVolCreateXMLFro= m }, { "StorageVolLookupByName", virtDBusStoragePoolStorageVolLookupByName = }, { "Undefine", virtDBusStoragePoolUndefine }, { 0 } diff --git a/tests/test_storage.py b/tests/test_storage.py index ae06007..63ecf91 100755 --- a/tests/test_storage.py +++ b/tests/test_storage.py @@ -130,6 +130,28 @@ class TestStoragePool(libvirttest.BaseTestClass): def test_storage_pool_volume_create(self, storage_volume_create): assert isinstance(storage_volume_create, dbus.ObjectPath) =20 + @pytest.mark.usefixtures('storage_volume_create') + def test_storage_pool_volume_create_xml_from(self): + minimal_storage_vol_clone_xml =3D ''' + + clone.img + 1 + + ''' + _, test_storage_vol =3D self.get_test_storage_volume() + props =3D test_storage_vol.GetAll('org.libvirt.StorageVol', + dbus_interface=3Ddbus.PROPERTIES_I= FACE) + test_storage_vol_key =3D str(props['Key']) + + _, test_storage_pool =3D self.get_test_storage_pool() + storage_pool_iface =3D dbus.Interface(test_storage_pool, + 'org.libvirt.StoragePool') + + new_vol_path =3D storage_pool_iface.StorageVolCreateXMLFrom(minima= l_storage_vol_clone_xml, + test_sto= rage_vol_key, + 0) + assert isinstance(new_vol_path, dbus.ObjectPath) + =20 @pytest.mark.usefixtures('storage_volume_create') class TestStorageVolume(libvirttest.BaseTestClass): --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list