Unify most of the tests into a common test named disk-cdrom-network by
adding multiple cdroms. The 'http' test is dropped since there can be
only 4 cdroms.
Signed-off-by: Peter Krempa
---
tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 27
tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml | 36 --
.../qemuxml2argvdata/disk-cdrom-network-ftps.args | 27
tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml | 36 --
.../qemuxml2argvdata/disk-cdrom-network-http.args | 27
tests/qemuxml2argvdata/disk-cdrom-network-http.xml | 36 --
.../qemuxml2argvdata/disk-cdrom-network-tftp.args | 27
tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml | 36 --
...-network-https.args => disk-cdrom-network.args} | 9 ++
...om-network-https.xml => disk-cdrom-network.xml} | 27
tests/qemuxml2argvtest.c | 6 +---
11 files changed, 37 insertions(+), 257 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml
rename tests/qemuxml2argvdata/{disk-cdrom-network-https.args =>
disk-cdrom-network.args} (58%)
rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml =>
disk-cdrom-network.xml} (52%)
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args
b/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args
deleted file mode 100644
index e9eab22aaf..00
--- a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args
+++ /dev/null
@@ -1,27 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
--S \
--machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \
--m 1024 \
--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 \
--boot d \
--usb \
--drive file=ftp://host.name:21/url/path/file.iso,format=raw,if=none,\
-id=drive-ide0-1-0,media=cdrom,readonly=on \
--device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml
b/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml
deleted file mode 100644
index b4e3311606..00
--- a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 1048576
- 1048576
- 1
-
-hvm
-
-
-
-
-
-
-
-
- destroy
- restart
- restart
-
-/usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args
b/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args
deleted file mode 100644
index d334f7938f..00
--- a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args
+++ /dev/null
@@ -1,27 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
--S \
--machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \
--m 1024 \
--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 \
--boot d \
--usb \
--drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\
-id=drive-ide0-1-0,media=cdrom,readonly=on \
--device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml
b/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml
deleted file mode 100644
index 4e6ca1bad1..00
--- a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 1048576
- 1048576
- 1
-
-hvm
-
-
-
-
-
-
-
-
- destroy
- restart
- restart
-
-/usr/bin/qemu-system-x86_64
-
-
