[PATCH 13/20] qemuxml2argvtest: Modernize 'disk-network-rbd-no-colon' case

[Peter Krempa]

The test case fails in pre-blockdev scenarios as it would pass RBD
parameters behind our back but succeeds after as we pass it in JSON form
which doesn't have that defect.

Cover both cases instead of the fake-caps version.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ...isk-network-rbd-no-colon.x86_64-4.1.0.err} |  0
 ...sk-network-rbd-no-colon.x86_64-latest.args | 39 +++++++++++++++++++
 tests/qemuxml2argvtest.c                      |  3 +-
 3 files changed, 41 insertions(+), 1 deletion(-)
 rename tests/qemuxml2argvdata/{disk-network-rbd-no-colon.err => disk-network-rbd-no-colon.x86_64-4.1.0.err} (100%)
 create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args

diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.err b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-network-rbd-no-colon.err
rename to tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args
new file mode 100644
index 0000000000..9a35dbcf7f
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"rbd","pool":"poolname","image":"imagename:rbd_cache=1:rbd_cache_size=67108864:rbd_cache_max_dirty=0","server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"},{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,id=virtio-disk0 \
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1f633e3f07..bfa41a2f81 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1349,7 +1349,8 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-network-gluster");
     DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0");
     DO_TEST_CAPS_LATEST("disk-network-rbd");
-    DO_TEST_FAILURE_NOCAPS("disk-network-rbd-no-colon");
+    DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0");
+    DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon");
     DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0");
     DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0");
     DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0");
-- 
2.31.1