External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Use virStoragePoolObjIsDuplicate for storage define/create

Browse Source 
Avoid the chance that there could be a duplicate storage pool UUID
or Name from the test driver storage pool define/create functions.
This commit is contained in:
John Ferlan 2017-12-18 07:41:16 -05:00
parent 607524af4f
commit 394eaa6b39
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/test_driver.c
View File

@ -4440,14 +4440,8 @@ testStoragePoolCreateXML(virConnectPtr conn,
if (!(newDef = virStoragePoolDefParseString(xml)))
goto cleanup;
obj = virStoragePoolObjFindByUUID(privconn->pools, newDef->uuid);
if (!obj)
obj = virStoragePoolObjFindByName(privconn->pools, newDef->name);
if (obj) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("storage pool already exists"));
if (virStoragePoolObjIsDuplicate(privconn->pools, newDef, true) < 0)
goto cleanup;
}
if (!(obj = virStoragePoolObjAssignDef(privconn->pools, newDef)))
goto cleanup;
@ -4520,6 +4514,9 @@ testStoragePoolDefineXML(virConnectPtr conn,
newDef->allocation = defaultPoolAlloc;
newDef->available = defaultPoolCap - defaultPoolAlloc;
if (virStoragePoolObjIsDuplicate(privconn->pools, newDef, false) < 0)
goto cleanup;
if (!(obj = virStoragePoolObjAssignDef(privconn->pools, newDef)))
goto cleanup;
newDef = NULL;