External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-08 07:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Add testStorageVolDefFindByName for storage volume tests

Browse Source 
Remove repetitive code, replace with common function.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-05 17:21:50 -04:00
parent 0e18356271
commit 55b1f1aaba
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/test/test_driver.c
View File

@ -4830,9 +4830,24 @@ testStoragePoolListAllVolumes(virStoragePoolPtr pool,
}
static virStorageVolDefPtr
testStorageVolDefFindByName(virStoragePoolObjPtr obj,
const char *name)
{
virStorageVolDefPtr privvol;
if (!(privvol = virStorageVolDefFindByName(obj, name))) {
virReportError(VIR_ERR_NO_STORAGE_VOL,
_("no storage vol with matching name '%s'"), name);
}
return privvol;
}
static virStorageVolPtr
testStorageVolLookupByName(virStoragePoolPtr pool,
const char *name ATTRIBUTE_UNUSED)
const char *name)
{
testDriverPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr obj;
@ -4842,13 +4857,8 @@ testStorageVolLookupByName(virStoragePoolPtr pool,
if (!(obj = testStoragePoolObjFindActiveByName(privconn, pool->name)))
return NULL;
privvol = virStorageVolDefFindByName(obj, name);
if (!privvol) {
virReportError(VIR_ERR_NO_STORAGE_VOL,
_("no storage vol with matching name '%s'"), name);
if (!(privvol = testStorageVolDefFindByName(obj, name)))
goto cleanup;
}
ret = virGetStorageVol(pool->conn, obj->def->name,
privvol->name, privvol->key,
@ -5077,14 +5087,8 @@ testStorageVolDelete(virStorageVolPtr vol,
if (!(obj = testStoragePoolObjFindActiveByName(privconn, vol->pool)))
return -1;
privvol = virStorageVolDefFindByName(obj, vol->name);
if (privvol == NULL) {
virReportError(VIR_ERR_NO_STORAGE_VOL,
_("no storage vol with matching name '%s'"),
vol->name);
if (!(privvol = testStorageVolDefFindByName(obj, vol->name)))
goto cleanup;
}
obj->def->allocation -= privvol->target.allocation;
obj->def->available = (obj->def->capacity - obj->def->allocation);
@ -5132,14 +5136,8 @@ testStorageVolGetInfo(virStorageVolPtr vol,
if (!(obj = testStoragePoolObjFindActiveByName(privconn, vol->pool)))
return -1;
privvol = virStorageVolDefFindByName(obj, vol->name);
if (privvol == NULL) {
virReportError(VIR_ERR_NO_STORAGE_VOL,
_("no storage vol with matching name '%s'"),
vol->name);
if (!(privvol = testStorageVolDefFindByName(obj, vol->name)))
goto cleanup;
}
memset(info, 0, sizeof(*info));
info->type = testStorageVolumeTypeForPool(obj->def->type);
@ -5167,14 +5165,8 @@ testStorageVolGetXMLDesc(virStorageVolPtr vol,
if (!(obj = testStoragePoolObjFindActiveByName(privconn, vol->pool)))
return NULL;
privvol = virStorageVolDefFindByName(obj, vol->name);
if (privvol == NULL) {
virReportError(VIR_ERR_NO_STORAGE_VOL,
_("no storage vol with matching name '%s'"),
vol->name);
if (!(privvol = testStorageVolDefFindByName(obj, vol->name)))
goto cleanup;
}
ret = virStorageVolDefFormat(obj->def, privvol);
@ -5195,14 +5187,8 @@ testStorageVolGetPath(virStorageVolPtr vol)
if (!(obj = testStoragePoolObjFindActiveByName(privconn, vol->pool)))
return NULL;
privvol = virStorageVolDefFindByName(obj, vol->name);
if (privvol == NULL) {
virReportError(VIR_ERR_NO_STORAGE_VOL,
_("no storage vol with matching name '%s'"),
vol->name);
if (!(privvol = testStorageVolDefFindByName(obj, vol->name)))
goto cleanup;
}
ignore_value(VIR_STRDUP(ret, privvol->target.path));