10:51 a.m.
The xml2argv variant was unused. The xml2xml variant is redundant in
other tests for RBD.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../disk-network-rbd-ceph-env.args | 25 ------------
.../qemuxml2argvdata/disk-network-rbd-ceph-env.xml | 39 -------------------
.../disk-network-rbd-ceph-env.xml | 44 ----------------------
tests/qemuxml2xmltest.c | 1 -
4 files changed, 109 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml
diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args
b/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args
deleted file mode 100644
index ead74e3110..0000000000
--- a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args
+++ /dev/null
@@ -1,25 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-CEPH_ARGS=-m \
-mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \
-/usr/bin/qemu-system-i686 \
--name QEMUGuest1 \
--S \
--M pc \
--m 214 \
--smp 1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
--drive file=rbd:pool/image,format=raw,if=virtio \
--net none \
--serial none \
--parallel none
diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml
b/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml
deleted file mode 100644
index 4f54867c6c..0000000000
--- a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml
+++ /dev/null
@@ -1,39 +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='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/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml
b/tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml
deleted file mode 100644
index 2e46e1d0b9..0000000000
--- a/tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml
+++ /dev/null
@@ -1,44 +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='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/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index b2aa903ec9..a0bf160ee6 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -364,7 +364,6 @@ mymain(void)
DO_TEST("disk-network-rbd", NONE);
DO_TEST("disk-network-rbd-auth", NONE);
DO_TEST("disk-network-rbd-ipv6", NONE);
- DO_TEST("disk-network-rbd-ceph-env", NONE);
DO_TEST("disk-network-source-auth", NONE);
DO_TEST("disk-network-sheepdog", NONE);
DO_TEST("disk-network-vxhs", NONE);
--
2.16.2