Commit 2dadaab5 authored by Katerina Koukiou's avatar Katerina Koukiou

Implement StorageVolCreateXMLFrom method for StoragePool Interface

Signed-off-by: 's avatarKaterina Koukiou <kkoukiou@redhat.com>
Reviewed-by: Jano Tomko's avatarJán Tomko <jtomko@redhat.com>
parent 05a45293
......@@ -75,6 +75,15 @@
<arg name="flags" type="u" direction="in"/>
<arg name="storageVol" type="o" direction="out"/>
</method>
<method name="StorageVolCreateXMLFrom">
<annotation name="org.gtk.GDBus.DocString"
value="See https://libvirt.org/html/libvirt-libvirt-storage.html#virStorageVolCreateXMLFrom
Call with @key argument set to the key of the storage volume to be cloned."/>
<arg name="xml" type="s" direction="in"/>
<arg name="key" type="s" direction="in"/>
<arg name="flags" type="u" direction="in"/>
<arg name="storageVol" type="o" direction="out"/>
</method>
<method name="StorageVolLookupByName">
<annotation name="org.gtk.GDBus.DocString"
value="See https://libvirt.org/html/libvirt-libvirt-storage.html#virStorageVolLookupByName"/>
......
......@@ -400,6 +400,46 @@ virtDBusStoragePoolStorageVolCreateXML(GVariant *inArgs,
*outArgs = g_variant_new("(o)", path);
}
static void
virtDBusStoragePoolStorageVolCreateXMLFrom(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
const gchar *objectPath,
gpointer userData,
GVariant **outArgs,
GUnixFDList **outFDs G_GNUC_UNUSED,
GError **error)
{
virtDBusConnect *connect = userData;
g_autoptr(virStoragePool) storagePool = NULL;
g_autoptr(virStorageVol) storageVol = NULL;
g_autoptr(virStorageVol) storageVolOld = NULL;
const gchar *key;
const gchar *xml;
guint flags;
g_autofree gchar *path = NULL;
g_variant_get(inArgs, "(&s&su)", &xml, &key, &flags);
storagePool = virtDBusStoragePoolGetVirStoragePool(connect, objectPath,
error);
if (!storagePool)
return;
storageVolOld = virStorageVolLookupByKey(connect->connection, key);
if (!storageVolOld)
return virtDBusUtilSetLastVirtError(error);
storageVol = virStorageVolCreateXMLFrom(storagePool, xml, storageVolOld,
flags);
if (!storageVol)
return virtDBusUtilSetLastVirtError(error);
path = virtDBusUtilBusPathForVirStorageVol(storageVol,
connect->storageVolPath);
*outArgs = g_variant_new("(o)", path);
}
static void
virtDBusStoragePoolStorageVolLookupByName(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
......@@ -474,6 +514,7 @@ static virtDBusGDBusMethodTable virtDBusStoragePoolMethodTable[] = {
{ "ListStorageVolumes", virtDBusStoragePoolListStorageVolumes },
{ "Refresh", virtDBusStoragePoolRefresh },
{ "StorageVolCreateXML", virtDBusStoragePoolStorageVolCreateXML },
{ "StorageVolCreateXMLFrom", virtDBusStoragePoolStorageVolCreateXMLFrom },
{ "StorageVolLookupByName", virtDBusStoragePoolStorageVolLookupByName },
{ "Undefine", virtDBusStoragePoolUndefine },
{ 0 }
......
......@@ -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)
@pytest.mark.usefixtures('storage_volume_create')
def test_storage_pool_volume_create_xml_from(self):
minimal_storage_vol_clone_xml = '''
<volume>
<name>clone.img</name>
<capacity unit="G">1</capacity>
</volume>
'''
_, test_storage_vol = self.get_test_storage_volume()
props = test_storage_vol.GetAll('org.libvirt.StorageVol',
dbus_interface=dbus.PROPERTIES_IFACE)
test_storage_vol_key = str(props['Key'])
_, test_storage_pool = self.get_test_storage_pool()
storage_pool_iface = dbus.Interface(test_storage_pool,
'org.libvirt.StoragePool')
new_vol_path = storage_pool_iface.StorageVolCreateXMLFrom(minimal_storage_vol_clone_xml,
test_storage_vol_key,
0)
assert isinstance(new_vol_path, dbus.ObjectPath)
@pytest.mark.usefixtures('storage_volume_create')
class TestStorageVolume(libvirttest.BaseTestClass):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment