mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
tests: introduce qemu disk-network-iscsi-modern test cases
This uses the new -drive options instead of iSCSI URI. Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
9ea3fdc6e9
commit
1c36109e37
52
tests/qemuxml2argvdata/disk-network-iscsi-modern.args
Normal file
52
tests/qemuxml2argvdata/disk-network-iscsi-modern.args
Normal file
@ -0,0 +1,52 @@
|
||||
LC_ALL=C \
|
||||
PATH=/bin \
|
||||
HOME=/home/test \
|
||||
USER=test \
|
||||
LOGNAME=test \
|
||||
QEMU_AUDIO_DRV=none \
|
||||
/usr/bin/qemu-system-i686 \
|
||||
-name QEMUGuest1 \
|
||||
-S \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
|
||||
-m 214 \
|
||||
-smp 1,sockets=1,cores=1,threads=1 \
|
||||
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||
-display none \
|
||||
-no-user-config \
|
||||
-nodefaults \
|
||||
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
||||
server,nowait \
|
||||
-mon chardev=charmonitor,id=monitor,mode=control \
|
||||
-rtc base=utc \
|
||||
-no-shutdown \
|
||||
-no-acpi \
|
||||
-boot c \
|
||||
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
|
||||
-usb \
|
||||
-drive file.driver=iscsi,file.portal=example.org:6000,\
|
||||
file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,\
|
||||
if=none,id=drive-virtio-disk0 \
|
||||
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
|
||||
id=virtio-disk0 \
|
||||
-drive file.driver=iscsi,file.portal=example.org:6000,\
|
||||
file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,format=raw,\
|
||||
if=none,id=drive-virtio-disk1 \
|
||||
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\
|
||||
id=virtio-disk1 \
|
||||
-drive file.driver=iscsi,file.portal=example.org:6000,\
|
||||
file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,\
|
||||
file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,\
|
||||
format=raw,if=none,id=drive-virtio-disk2 \
|
||||
-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\
|
||||
id=virtio-disk2 \
|
||||
-drive file.driver=iscsi,file.portal=example.org:6000,\
|
||||
file.target=iqn.1992-01.com.example:storage,file.lun=2,file.transport=tcp,\
|
||||
file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,\
|
||||
format=raw,if=none,id=drive-virtio-disk3 \
|
||||
-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,\
|
||||
id=virtio-disk3 \
|
||||
-drive file.driver=iscsi,file.portal=example.org:3260,\
|
||||
file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,\
|
||||
if=none,id=drive-scsi0-0-0-0 \
|
||||
-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\
|
||||
drive=drive-scsi0-0-0-0,id=scsi0-0-0-0
|
65
tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
Normal file
65
tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
Normal file
@ -0,0 +1,65 @@
|
||||
<domain type='qemu'>
|
||||
<name>QEMUGuest1</name>
|
||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||
<memory unit='KiB'>219136</memory>
|
||||
<currentMemory unit='KiB'>219136</currentMemory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='i686' machine='pc'>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-i686</emulator>
|
||||
<disk type='network' device='disk'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source protocol='iscsi' name='iqn.1992-01.com.example'>
|
||||
<host name='example.org' port='6000'/>
|
||||
</source>
|
||||
<target dev='vda' bus='virtio'/>
|
||||
</disk>
|
||||
<disk type='network' device='disk'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source protocol='iscsi' name='iqn.1992-01.com.example/1'>
|
||||
<host name='example.org' port='6000'/>
|
||||
</source>
|
||||
<target dev='vdb' bus='virtio'/>
|
||||
</disk>
|
||||
<disk type='network' device='disk'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<auth username='myname'>
|
||||
<secret type='iscsi' usage='mycluster_myname'/>
|
||||
</auth>
|
||||
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'>
|
||||
<host name='example.org' port='6000'/>
|
||||
</source>
|
||||
<target dev='vdc' bus='virtio'/>
|
||||
</disk>
|
||||
<disk type='network' device='disk'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<auth username='myname'>
|
||||
<secret type='iscsi' usage='mycluster_myname'/>
|
||||
</auth>
|
||||
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'>
|
||||
<host name='example.org' port='6000'/>
|
||||
</source>
|
||||
<target dev='vdd' bus='virtio'/>
|
||||
</disk>
|
||||
<disk type='network' device='lun'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source protocol='iscsi' name='iqn.1992-01.com.example'>
|
||||
<host name='example.org' port='3260'/>
|
||||
</source>
|
||||
<target dev='sda' bus='scsi'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'/>
|
||||
<controller type='pci' index='0' model='pci-root'/>
|
||||
<controller type='scsi' index='0' model='virtio-scsi'/>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<input type='keyboard' bus='ps2'/>
|
||||
<memballoon model='none'/>
|
||||
</devices>
|
||||
</domain>
|
@ -1057,6 +1057,10 @@ mymain(void)
|
||||
DO_TEST("disk-network-nbd", NONE);
|
||||
DO_TEST_CAPS_LATEST("disk-network-nbd");
|
||||
DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK);
|
||||
DO_TEST("disk-network-iscsi-modern",
|
||||
QEMU_CAPS_VIRTIO_SCSI,
|
||||
QEMU_CAPS_SCSI_BLOCK,
|
||||
QEMU_CAPS_ISCSI_PASSWORD_SECRET);
|
||||
DO_TEST_CAPS_LATEST("disk-network-iscsi");
|
||||
DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE);
|
||||
DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype", NONE);
|
||||
|
Loading…
x
Reference in New Issue
Block a user