aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorOsier Yang <jyang@redhat.com>2012-02-10 12:51:47 +0800
committerOsier Yang <jyang@redhat.com>2012-02-10 12:53:25 +0800
commit7c90026db953705d7e30cd87cda01a8504227c5c (patch)
tree9a27bdf5362b326e2dfe70b5f5cf31054195ca11 /src/test
parentRemove single quotes from audit records (diff)
downloadlibvirt-7c90026db953705d7e30cd87cda01a8504227c5c.tar.gz
libvirt-7c90026db953705d7e30cd87cda01a8504227c5c.tar.bz2
libvirt-7c90026db953705d7e30cd87cda01a8504227c5c.zip
npiv: Auto-generate WWN if it's not specified
The auto-generated WWN comply with the new addressing schema of WWN: <quote> the first nibble is either hex 5 or 6 followed by a 3-byte vendor identifier and 36 bits for a vendor-specified serial number. </quote> We choose hex 5 for the first nibble. And for the 3-bytes vendor ID, we uses the OUI according to underlying hypervisor type, (invoking virConnectGetType to get the virt type). e.g. If virConnectGetType returns "QEMU", we use Qumranet's OUI (00:1A:4A), if returns ESX|VMWARE, we use VMWARE's OUI (00:05:69). Currently it only supports qemu|xen|libxl|xenapi|hyperv|esx|vmware drivers. The last 36 bits are auto-generated.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_driver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index bf6b14835..39fd63dea 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -608,7 +608,7 @@ static int testOpenDefault(virConnectPtr conn) {
virStoragePoolObjUnlock(poolobj);
/* Init default node device */
- if (!(nodedef = virNodeDeviceDefParseString(defaultNodeXML, 0)))
+ if (!(nodedef = virNodeDeviceDefParseString(defaultNodeXML, 0, NULL)))
goto error;
if (!(nodeobj = virNodeDeviceAssignDef(&privconn->devs,
nodedef))) {
@@ -1057,12 +1057,12 @@ static int testOpenFromFile(virConnectPtr conn,
goto error;
}
- def = virNodeDeviceDefParseFile(absFile, 0);
+ def = virNodeDeviceDefParseFile(absFile, 0, NULL);
VIR_FREE(absFile);
if (!def)
goto error;
} else {
- if ((def = virNodeDeviceDefParseNode(xml, devs[i], 0)) == NULL)
+ if ((def = virNodeDeviceDefParseNode(xml, devs[i], 0, NULL)) == NULL)
goto error;
}
if (!(dev = virNodeDeviceAssignDef(&privconn->devs, def))) {
@@ -5285,7 +5285,7 @@ testNodeDeviceCreateXML(virConnectPtr conn,
testDriverLock(driver);
- def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE);
+ def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, NULL);
if (def == NULL) {
goto cleanup;
}