[libvirt] [PATCH 18/24] tests: qemuxml2argv: Unify testing of 'disk-network-rbd'

Move the authentication and ipv6 cases into the main test file. To allow removal of the separate testing of the secure credential passing via the 'secret' object in qemu, use the DO_TEST_CAPS_VER macro with version 2.5.0 when the secret object is not supported by qemu. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../disk-network-rbd-auth-AES.args | 47 ----------------- .../qemuxml2argvdata/disk-network-rbd-auth-AES.xml | 55 ------------------- tests/qemuxml2argvdata/disk-network-rbd-auth.args | 32 ------------ tests/qemuxml2argvdata/disk-network-rbd-auth.xml | 42 --------------- tests/qemuxml2argvdata/disk-network-rbd-ipv6.args | 31 ----------- tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml | 40 -------------- tests/qemuxml2argvdata/disk-network-rbd.args | 44 ---------------- .../disk-network-rbd.x86_64-2.5.0.args | 55 +++++++++++++++++++ .../disk-network-rbd.x86_64-latest.args | 61 ++++++++++++++++++++++ tests/qemuxml2argvdata/disk-network-rbd.xml | 28 +++++++--- tests/qemuxml2argvtest.c | 9 ++-- tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml | 47 ----------------- tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml | 45 ---------------- tests/qemuxml2xmloutdata/disk-network-rbd.xml | 30 ++++++++--- tests/qemuxml2xmltest.c | 2 - 15 files changed, 165 insertions(+), 403 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args b/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args deleted file mode 100644 index 9c39082bec..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args +++ /dev/null @@ -1,47 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --object secret,id=masterKey0,format=raw,\ -file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --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=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --object secret,id=virtio-disk0-secret0,\ -data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\ -6322,file.password-secret=virtio-disk0-secret0,format=raw,if=none,\ -id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ --object secret,id=scsi0-0-0-0-secret0,\ -data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\ -6322,file.password-secret=scsi0-0-0-0-secret0,format=raw,if=none,\ -id=drive-scsi0-0-0-0,cache=none' \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml b/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml deleted file mode 100644 index 390d2d6038..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml +++ /dev/null @@ -1,55 +0,0 @@ -<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='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw' cache='none'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target bus='scsi' dev='sda'/> - </disk> - <controller type='usb' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth.args b/tests/qemuxml2argvdata/disk-network-rbd-auth.args deleted file mode 100644 index 163f02aef6..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-auth.args +++ /dev/null @@ -1,32 +0,0 @@ -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 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive 'file=rbd:pool/image:id=myname:\ -key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ -auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:\ -6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth.xml b/tests/qemuxml2argvdata/disk-network-rbd-auth.xml deleted file mode 100644 index 10b9738a9b..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-auth.xml +++ /dev/null @@ -1,42 +0,0 @@ -<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='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.args b/tests/qemuxml2argvdata/disk-network-rbd-ipv6.args deleted file mode 100644 index 413b3c4ffd..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.args +++ /dev/null @@ -1,31 +0,0 @@ -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 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ -6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:\ -ff00\:42\:8329]\:6322,format=raw,if=none,id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml b/tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml deleted file mode 100644 index 7dad32e0c9..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml +++ /dev/null @@ -1,40 +0,0 @@ -<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='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='rbd' name='pool/image'> - <host name='::1' port='6321'/> - <host name='example.org' port='6789'/> - <host name='ffff:1234:567:abc::0f' port='6322'/> - <host name='2001:db8::ff00:42:8329' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-rbd.args b/tests/qemuxml2argvdata/disk-network-rbd.args deleted file mode 100644 index 08a712e67f..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd.args +++ /dev/null @@ -1,44 +0,0 @@ -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 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\ -6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ -id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ --drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,\ -id=drive-virtio-disk1 \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ -id=virtio-disk1 \ --drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ -6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ -id=drive-virtio-disk2' \ --device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\ -id=virtio-disk2 \ --drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ -format=raw,if=none,id=drive-virtio-disk3 \ --device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,\ -id=virtio-disk3 diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args new file mode 100644 index 0000000000..82fce3f4de --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args @@ -0,0 +1,55 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-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 strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ +id=drive-virtio-disk0' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ +id=drive-virtio-disk2' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ +format=raw,if=none,id=drive-virtio-disk3 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\ +id=virtio-disk3 \ +-drive 'file=rbd:pool/image:id=myname:\ +key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ +auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:\ +6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk4' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,\ +id=virtio-disk4 \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ +6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:\ +ff00\:42\:8329]\:6322,format=raw,if=none,id=drive-virtio-disk5' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk5,\ +id=virtio-disk5 \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args new file mode 100644 index 0000000000..0c5898cbd3 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -0,0 +1,61 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ +id=drive-virtio-disk0' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ +id=drive-virtio-disk2' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ +format=raw,if=none,id=drive-virtio-disk3 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\ +id=virtio-disk3 \ +-object secret,id=virtio-disk4-secret0,\ +data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ +-drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\ +mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\ +6322,file.password-secret=virtio-disk4-secret0,format=raw,if=none,\ +id=drive-virtio-disk4' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,\ +id=virtio-disk4 \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ +6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:\ +ff00\:42\:8329]\:6322,format=raw,if=none,id=drive-virtio-disk5' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk5,\ +id=virtio-disk5 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-network-rbd.xml b/tests/qemuxml2argvdata/disk-network-rbd.xml index e342ff3b2f..124a80cdf8 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.xml +++ b/tests/qemuxml2argvdata/disk-network-rbd.xml @@ -14,12 +14,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='rbd' name='pool/image'> @@ -54,6 +48,28 @@ </source> <target dev='vdd' bus='virtio'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='rbd' name='pool/image'> + <host name='mon1.example.org' port='6321'/> + <host name='mon2.example.org' port='6322'/> + <host name='mon3.example.org' port='6322'/> + </source> + <target dev='vde' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='rbd' name='pool/image'> + <host name='::1' port='6321'/> + <host name='example.org' port='6789'/> + <host name='ffff:1234:567:abc::0f' port='6322'/> + <host name='2001:db8::ff00:42:8329' port='6322'/> + </source> + <target dev='vdf' bus='virtio'/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7019d65eb7..2db4d350a5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1045,14 +1045,11 @@ mymain(void) DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); DO_TEST("disk-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); - DO_TEST("disk-network-rbd", NONE); + DO_TEST_CAPS_VER("disk-network-rbd", "2.5.0"); + DO_TEST_CAPS_LATEST("disk-network-rbd"); + DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); DO_TEST("disk-network-sheepdog", NONE); - DO_TEST("disk-network-rbd-auth", NONE); DO_TEST("disk-network-source-auth", NONE); - DO_TEST("disk-network-rbd-auth-AES", - QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("disk-network-rbd-ipv6", NONE); - DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS); driver.config->vxhsTLS = 1; DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS, diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml b/tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml deleted file mode 100644 index b18335c1bd..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml +++ /dev/null @@ -1,47 +0,0 @@ -<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='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml b/tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml deleted file mode 100644 index 765ee26a24..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml +++ /dev/null @@ -1,45 +0,0 @@ -<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='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='rbd' name='pool/image'> - <host name='::1' port='6321'/> - <host name='example.org' port='6789'/> - <host name='ffff:1234:567:abc::0f' port='6322'/> - <host name='2001:db8::ff00:42:8329' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml b/tests/qemuxml2xmloutdata/disk-network-rbd.xml index 344fb9c107..a870bb82f8 100644 --- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml +++ b/tests/qemuxml2xmloutdata/disk-network-rbd.xml @@ -14,12 +14,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='rbd' name='pool/image'> @@ -58,6 +52,30 @@ <target dev='vdd' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='rbd' name='pool/image'> + <host name='mon1.example.org' port='6321'/> + <host name='mon2.example.org' port='6322'/> + <host name='mon3.example.org' port='6322'/> + </source> + <target dev='vde' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='rbd' name='pool/image'> + <host name='::1' port='6321'/> + <host name='example.org' port='6789'/> + <host name='ffff:1234:567:abc::0f' port='6322'/> + <host name='2001:db8::ff00:42:8329' port='6322'/> + </source> + <target dev='vdf' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a0bf160ee6..a333d448c3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -362,8 +362,6 @@ mymain(void) DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-rbd", NONE); - DO_TEST("disk-network-rbd-auth", NONE); - DO_TEST("disk-network-rbd-ipv6", NONE); DO_TEST("disk-network-source-auth", NONE); DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); -- 2.16.2