tests: qemublock: Add tests for all other format without special options

Similarly to the 'raw' case add tests for bochs, cloop, dmg, ploop, vdi
vhd, and vpc. Covering all supported non-backing formats.

Note that the JSON name for 'ploop' maps to 'parallels' and 'vhd' maps
to 'vhdx'.

Files added here would result in the followint configs:

file-bochs-noopts.xml:
-drive file=/path/to/i.img,format=bochs,if=none,id=drive-dummy
-device virtio-blk-pci,scsi=off,drive=drive-dummy,id=dummy

file-cloop-noopts.xml:
-drive file=/path/to/i.img,format=cloop,if=none,id=drive-dummy
-device virtio-blk-pci,scsi=off,drive=drive-dummy,id=dummy

file-dmg-noopts.xml:
-drive file=/path/to/i.img,format=dmg,if=none,id=drive-dummy
-device virtio-blk-pci,scsi=off,drive=drive-dummy,id=dummy

file-ploop-noopts.xml:
-drive file=/path/to/i.img,format=ploop,if=none,id=drive-dummy
-device virtio-blk-pci,scsi=off,drive=drive-dummy,id=dummy

file-vdi-noopts.xml:
-drive file=/path/to/i.img,format=vdi,if=none,id=drive-dummy
-device virtio-blk-pci,scsi=off,drive=drive-dummy,id=dummy

file-vhd-noopts.xml:
-drive file=/path/to/i.img,format=vhd,if=none,id=drive-dummy
-device virtio-blk-pci,scsi=off,drive=drive-dummy,id=dummy

file-vpc-noopts.xml:
-drive file=/path/to/i.img,format=vpc,if=none,id=drive-dummy
-device virtio-blk-pci,scsi=off,drive=drive-dummy,id=dummy

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Peter Krempa 2018-03-28 10:11:38 +02:00
parent 5ce01b15e1
commit c4f0e16f5a
15 changed files with 175 additions and 0 deletions

View File

@ -406,6 +406,13 @@ mymain(void)
TEST_DISK_TO_JSON_FULL("nodename-long-protocol", true);
TEST_DISK_TO_JSON("file-raw-noopts");
TEST_DISK_TO_JSON("file-bochs-noopts");
TEST_DISK_TO_JSON("file-cloop-noopts");
TEST_DISK_TO_JSON("file-dmg-noopts");
TEST_DISK_TO_JSON("file-ploop-noopts");
TEST_DISK_TO_JSON("file-vdi-noopts");
TEST_DISK_TO_JSON("file-vhd-noopts");
TEST_DISK_TO_JSON("file-vpc-noopts");
cleanup:
virHashFree(diskxmljsondata.schema);

View File

@ -0,0 +1,12 @@
{
"node-name": "test1",
"read-only": false,
"driver": "bochs",
"file": {
"driver": "file",
"filename": "/path/to/i.img",
"node-name": "test2",
"read-only": false,
"discard": "unmap"
}
}

View File

@ -0,0 +1,12 @@
<disk device='disk'>
<driver name='qemu' type='bochs'/>
<source file='/path/to/i.img'>
<privateData>
<nodenames>
<nodename type='storage' name='test2'/>
<nodename type='format' name='test1'/>
</nodenames>
</privateData>
</source>
<target dev='vda'/>
</disk>

View File

@ -0,0 +1,12 @@
{
"node-name": "test1",
"read-only": false,
"driver": "cloop",
"file": {
"driver": "file",
"filename": "/path/to/i.img",
"node-name": "test2",
"read-only": false,
"discard": "unmap"
}
}

View File

@ -0,0 +1,12 @@
<disk device='disk'>
<driver name='qemu' type='cloop'/>
<source file='/path/to/i.img'>
<privateData>
<nodenames>
<nodename type='storage' name='test2'/>
<nodename type='format' name='test1'/>
</nodenames>
</privateData>
</source>
<target dev='vda'/>
</disk>

View File

@ -0,0 +1,12 @@
{
"node-name": "test1",
"read-only": false,
"driver": "dmg",
"file": {
"driver": "file",
"filename": "/path/to/i.img",
"node-name": "test2",
"read-only": false,
"discard": "unmap"
}
}

View File

@ -0,0 +1,12 @@
<disk device='disk'>
<driver name='qemu' type='dmg'/>
<source file='/path/to/i.img'>
<privateData>
<nodenames>
<nodename type='storage' name='test2'/>
<nodename type='format' name='test1'/>
</nodenames>
</privateData>
</source>
<target dev='vda'/>
</disk>

View File

@ -0,0 +1,12 @@
{
"node-name": "test1",
"read-only": false,
"driver": "parallels",
"file": {
"driver": "file",
"filename": "/path/to/i.img",
"node-name": "test2",
"read-only": false,
"discard": "unmap"
}
}

View File

@ -0,0 +1,12 @@
<disk device='disk'>
<driver name='qemu' type='ploop'/>
<source file='/path/to/i.img'>
<privateData>
<nodenames>
<nodename type='storage' name='test2'/>
<nodename type='format' name='test1'/>
</nodenames>
</privateData>
</source>
<target dev='vda'/>
</disk>

View File

@ -0,0 +1,12 @@
{
"node-name": "test1",
"read-only": false,
"driver": "vdi",
"file": {
"driver": "file",
"filename": "/path/to/i.img",
"node-name": "test2",
"read-only": false,
"discard": "unmap"
}
}

View File

@ -0,0 +1,12 @@
<disk device='disk'>
<driver name='qemu' type='vdi'/>
<source file='/path/to/i.img'>
<privateData>
<nodenames>
<nodename type='storage' name='test2'/>
<nodename type='format' name='test1'/>
</nodenames>
</privateData>
</source>
<target dev='vda'/>
</disk>

View File

@ -0,0 +1,12 @@
{
"node-name": "test1",
"read-only": false,
"driver": "vhdx",
"file": {
"driver": "file",
"filename": "/path/to/i.img",
"node-name": "test2",
"read-only": false,
"discard": "unmap"
}
}

View File

@ -0,0 +1,12 @@
<disk device='disk'>
<driver name='qemu' type='vhd'/>
<source file='/path/to/i.img'>
<privateData>
<nodenames>
<nodename type='storage' name='test2'/>
<nodename type='format' name='test1'/>
</nodenames>
</privateData>
</source>
<target dev='vda'/>
</disk>

View File

@ -0,0 +1,12 @@
{
"node-name": "test1",
"read-only": false,
"driver": "vpc",
"file": {
"driver": "file",
"filename": "/path/to/i.img",
"node-name": "test2",
"read-only": false,
"discard": "unmap"
}
}

View File

@ -0,0 +1,12 @@
<disk device='disk'>
<driver name='qemu' type='vpc'/>
<source file='/path/to/i.img'>
<privateData>
<nodenames>
<nodename type='storage' name='test2'/>
<nodename type='format' name='test1'/>
</nodenames>
</privateData>
</source>
<target dev='vda'/>
</disk>