NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

test: Add helper to create vHBA for testNodeDeviceCreateXML

Browse Source 
Rather than inline the dummy creation of a vHBA to add to the node
devices - create a helper to do that work.

Also just tidy up a couple of things while at it...
This commit is contained in:
John Ferlan 2017-01-24 07:48:36 -05:00
parent 5c2ff641e1
commit 0869d9b333
1 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/test/test_driver.c
View File

@ -5625,39 +5625,18 @@ testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames)
return ret; return ret;
} }
static virNodeDevicePtr
testNodeDeviceCreateXML(virConnectPtr conn, static int
const char *xmlDesc, testNodeDeviceMockCreateVport(virConnectPtr conn,
unsigned int flags) virNodeDeviceDefPtr def,
const char *wwpn)
{ {
int ret = -1;
testDriverPtr driver = conn->privateData; testDriverPtr driver = conn->privateData;
virNodeDeviceDefPtr def = NULL;
virNodeDeviceObjPtr obj = NULL;
char *wwnn = NULL, *wwpn = NULL;
int parent_host = -1;
virNodeDevicePtr dev = NULL;
virNodeDevCapsDefPtr caps; virNodeDevCapsDefPtr caps;
virNodeDeviceObjPtr obj = NULL;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
virCheckFlags(0, NULL);
testDriverLock(driver);
def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, NULL);
if (def == NULL)
goto cleanup;
/* We run these next two simply for validation */
if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1)
goto cleanup;
if (virNodeDeviceGetParentHost(&driver->devs,
def->name,
def->parent,
&parent_host) == -1) {
goto cleanup;
}
/* 'name' is supposed to be filled in by the node device backend, which /* 'name' is supposed to be filled in by the node device backend, which
* we don't have. Use WWPN instead. */ * we don't have. Use WWPN instead. */
VIR_FREE(def->name); VIR_FREE(def->name);
@ -5676,7 +5655,6 @@ testNodeDeviceCreateXML(virConnectPtr conn,
caps = caps->next; caps = caps->next;
} }
if (!(obj = virNodeDeviceAssignDef(&driver->devs, def))) if (!(obj = virNodeDeviceAssignDef(&driver->devs, def)))
goto cleanup; goto cleanup;
virNodeDeviceObjUnlock(obj); virNodeDeviceObjUnlock(obj);
@ -5684,6 +5662,51 @@ testNodeDeviceCreateXML(virConnectPtr conn,
event = virNodeDeviceEventLifecycleNew(def->name, event = virNodeDeviceEventLifecycleNew(def->name,
VIR_NODE_DEVICE_EVENT_CREATED, VIR_NODE_DEVICE_EVENT_CREATED,
0); 0);
testObjectEventQueue(driver, event);
ret = 0;
cleanup:
return ret;
}
static virNodeDevicePtr
testNodeDeviceCreateXML(virConnectPtr conn,
const char *xmlDesc,
unsigned int flags)
{
testDriverPtr driver = conn->privateData;
virNodeDeviceDefPtr def = NULL;
char *wwnn = NULL, *wwpn = NULL;
int parent_host = -1;
virNodeDevicePtr dev = NULL;
virCheckFlags(0, NULL);
testDriverLock(driver);
if (!(def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, NULL)))
goto cleanup;
/* We run these next two simply for validation - they are essentially
* 'validating' that the input XML either has a wwnn/wwpn or the
* virNodeDevCapSCSIHostParseXML generated a wwnn/wwpn and that the
* input XML has a parent host defined. */
if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) < 0)
goto cleanup;
if (virNodeDeviceGetParentHost(&driver->devs, def->name,
def->parent, &parent_host) < 0)
goto cleanup;
/* In the real code, we'd call virVHBAManageVport followed by
* find_new_device, but we cannot do that here since we're not
* mocking udev. So we just mock a creation by altering the
* input XML enough to make it look like a vHBA and add it
* to the list of node devices */
if (testNodeDeviceMockCreateVport(conn, def, wwpn) < 0)
goto cleanup;
dev = virGetNodeDevice(conn, def->name); dev = virGetNodeDevice(conn, def->name);
ignore_value(VIR_STRDUP(dev->parent, def->parent)); ignore_value(VIR_STRDUP(dev->parent, def->parent));
@ -5691,7 +5714,6 @@ testNodeDeviceCreateXML(virConnectPtr conn,
cleanup: cleanup:
testDriverUnlock(driver); testDriverUnlock(driver);
virNodeDeviceDefFree(def); virNodeDeviceDefFree(def);
testObjectEventQueue(driver, event);
VIR_FREE(wwnn); VIR_FREE(wwnn);
VIR_FREE(wwpn); VIR_FREE(wwpn);
return dev; return dev;