提交 394eaa6b 编写于 作者: J John Ferlan

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.
上级 607524af
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册