[libvirt] [PATCH v2 3/3] test: Use virStoragePoolObjIsDuplicate for storage define/create
Avoid the chance that there could be a duplicate storage pool UUID
or Name from the test driver storage pool define/create functions.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/test/test_driver.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 8adc2167b..dc743b498 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -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;
--
2.13.6