Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 d20de39c 编写于 作者: P Peter Krempa
浏览文件
操作

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: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 4d016add
隐藏空白更改
内联 并排
Showing with 165 addition and 312 deletion
tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml 已删除 100644 → 0
浏览文件 @ 4d016add
<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>
tests/qemuxml2argvdata/disk-network-rbd-auth.args 已删除 100644 → 0
浏览文件 @ 4d016add
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
tests/qemuxml2argvdata/disk-network-rbd-auth.xml 已删除 100644 → 0
浏览文件 @ 4d016add
<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>
tests/qemuxml2argvdata/disk-network-rbd-ipv6.args 已删除 100644 → 0
浏览文件 @ 4d016add
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
tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml 已删除 100644 → 0
浏览文件 @ 4d016add
<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>
tests/qemuxml2argvdata/disk-network-rbd.args → tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
浏览文件 @ d20de39c
...@@ -5,10 +5,11 @@ USER=test \ ...@@ -5,10 +5,11 @@ USER=test \
LOGNAME=test \ LOGNAME=test \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \ /usr/bin/qemu-system-i686 \
-name QEMUGuest1 \ -name guest=QEMUGuest1,debug-threads=on \
-S \ -S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \ -m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \
...@@ -20,25 +21,35 @@ server,nowait \ ...@@ -20,25 +21,35 @@ server,nowait \
-rtc base=utc \ -rtc base=utc \
-no-shutdown \ -no-shutdown \
-no-acpi \ -no-acpi \
-boot c \ -boot strict=on \
-usb \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-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\:\ -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,\ 6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\
id=drive-virtio-disk0' \ id=drive-virtio-disk0' \
-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
id=virtio-disk0 \ id=virtio-disk0,bootindex=1 \
-drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,\ -drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,\
id=drive-virtio-disk1 \ id=drive-virtio-disk1 \
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\
id=virtio-disk1 \ id=virtio-disk1 \
-drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ -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,\ 6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\
id=drive-virtio-disk2' \ id=drive-virtio-disk2' \
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\
id=virtio-disk2 \ id=virtio-disk2 \
-drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ -drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\
format=raw,if=none,id=drive-virtio-disk3 \ format=raw,if=none,id=drive-virtio-disk3 \
-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\
id=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
tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args → tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
浏览文件 @ d20de39c
...@@ -5,43 +5,57 @@ USER=test \ ...@@ -5,43 +5,57 @@ USER=test \
LOGNAME=test \ LOGNAME=test \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \ /usr/bin/qemu-system-i686 \
-name QEMUGuest1 \ -name guest=QEMUGuest1,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \ -m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \
-no-user-config \ -no-user-config \
-nodefaults \ -nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -chardev socket,id=charmonitor,fd=1729,server,nowait \
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \ -mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \ -rtc base=utc \
-no-shutdown \ -no-shutdown \
-no-acpi \ -no-acpi \
-boot c \ -boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-usb \ -drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ 6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\
-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' \ id=drive-virtio-disk0' \
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
id=virtio-disk0 \ id=virtio-disk0,bootindex=1 \
-object secret,id=scsi0-0-0-0-secret0,\ -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,\ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\ -drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\
mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\ 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,\ 6322,file.password-secret=virtio-disk4-secret0,format=raw,if=none,\
id=drive-scsi0-0-0-0,cache=none' \ id=drive-virtio-disk4' \
-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,\
drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 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
tests/qemuxml2argvdata/disk-network-rbd.xml
浏览文件 @ d20de39c
...@@ -14,12 +14,6 @@ ...@@ -14,12 +14,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <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'> <disk type='network' device='disk'>
<driver name='qemu' type='raw'/> <driver name='qemu' type='raw'/>
<source protocol='rbd' name='pool/image'> <source protocol='rbd' name='pool/image'>
...@@ -54,6 +48,28 @@ ...@@ -54,6 +48,28 @@
</source> </source>
<target dev='vdd' bus='virtio'/> <target dev='vdd' bus='virtio'/>
</disk> </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='usb' index='0'/>
<controller type='ide' index='0'/> <controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/> <controller type='pci' index='0' model='pci-root'/>
......
tests/qemuxml2argvtest.c
浏览文件 @ d20de39c
...@@ -1045,14 +1045,11 @@ mymain(void) ...@@ -1045,14 +1045,11 @@ mymain(void)
DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE);
DO_TEST("disk-network-gluster", DO_TEST("disk-network-gluster",
QEMU_CAPS_GLUSTER_DEBUG_LEVEL); 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-sheepdog", NONE);
DO_TEST("disk-network-rbd-auth", NONE);
DO_TEST("disk-network-source-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); DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS);
driver.config->vxhsTLS = 1; driver.config->vxhsTLS = 1;
DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS, DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS,
......
tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml 已删除 100644 → 0
浏览文件 @ 4d016add
<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>
tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml 已删除 100644 → 0
浏览文件 @ 4d016add
<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>
tests/qemuxml2xmloutdata/disk-network-rbd.xml
浏览文件 @ d20de39c
...@@ -14,12 +14,6 @@ ...@@ -14,12 +14,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <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'> <disk type='network' device='disk'>
<driver name='qemu' type='raw'/> <driver name='qemu' type='raw'/>
<source protocol='rbd' name='pool/image'> <source protocol='rbd' name='pool/image'>
...@@ -58,6 +52,30 @@ ...@@ -58,6 +52,30 @@
<target dev='vdd' bus='virtio'/> <target dev='vdd' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</disk> </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'> <controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
......
tests/qemuxml2xmltest.c
浏览文件 @ d20de39c
...@@ -362,8 +362,6 @@ mymain(void) ...@@ -362,8 +362,6 @@ mymain(void)
DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-gluster", NONE);
DO_TEST("disk-network-rbd", 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-source-auth", NONE);
DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-sheepdog", NONE);
DO_TEST("disk-network-vxhs", NONE); DO_TEST("disk-network-vxhs", NONE);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或