From 566b77b94d498426062dfddaf5a8c77250ba0857 Mon Sep 17 00:00:00 2001

Message-Id: <566b77b94d498426062dfddaf5a8c77250ba0857@dist-git>

From: Peter Krempa <pkrempa@redhat.com>

Date: Mon, 16 Mar 2020 22:12:00 +0100

Subject: [PATCH] qemuxml2argvtest: Add test case for disks with http(s) source

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Upcoming patches will implement the support for sslverify, cookies,

readahead, and timeout properties. Add a test file which will collect

the cases.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

(cherry picked from commit 3dd7952f6f996d13a0a685e1300c178fd9be6658)

 Conflicts:

  tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args:

  Test output differs on the '-cpu qemu64' line due to previous fixes

  to the testsuite not being backported

https://bugzilla.redhat.com/show_bug.cgi?id=1804750

Message-Id: <4ff67b442d284d3e8cdc9564b9378990b57fa3c0.1584391727.git.pkrempa@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 .../disk-network-http.x86_64-latest.args      | 56 +++++++++++++++++++

 tests/qemuxml2argvdata/disk-network-http.xml  | 50 +++++++++++++++++

 tests/qemuxml2argvtest.c                      |  1 +

 3 files changed, 107 insertions(+)

 create mode 100644 tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args

 create mode 100644 tests/qemuxml2argvdata/disk-network-http.xml

diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args

new file mode 100644

index 0000000000..d39f357072

--- /dev/null

+++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args

@@ -0,0 +1,56 @@

+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 \

+QEMU_AUDIO_DRV=none \

+/usr/bin/qemu-system-x86_64 \

+-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=kvm,usb=off,dump-guest-core=off \

+-m 214 \

+-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,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 \

+-blockdev '{"driver":"http","url":"http://example.org:80/test.img",\

+"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \

+-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\

+"file":"libvirt-4-storage"}' \

+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\

+id=virtio-disk0,bootindex=1 \

+-blockdev '{"driver":"https","url":"https://example.org:443/test2.img",\

+"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \

+-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\

+"file":"libvirt-3-storage"}' \

+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\

+id=virtio-disk1 \

+-blockdev '{"driver":"http","url":"http://example.org:1234/test3.img",\

+"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 virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\

+id=virtio-disk2 \

+-blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\

+"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,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-1-format,\

+id=virtio-disk3 \

+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

+resourcecontrol=deny \

+-msg timestamp=on

diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml

new file mode 100644

index 0000000000..83a9865c83

--- /dev/null

+++ b/tests/qemuxml2argvdata/disk-network-http.xml

@@ -0,0 +1,50 @@

+<domain type='kvm'>

+  <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='x86_64' 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>

+    <disk type='network' device='disk'>

+      <driver name='qemu' type='raw'/>

+      <source protocol='http' name='test.img'>

+        <host name='example.org'/>

+      </source>

+      <target dev='vda' bus='virtio'/>

+    </disk>

+    <disk type='network' device='disk'>

+      <driver name='qemu' type='raw'/>

+      <source protocol='https' name='test2.img'>

+        <host name='example.org'/>

+      </source>

+      <target dev='vdb' bus='virtio'/>

+    </disk>

+    <disk type='network' device='disk'>

+      <driver name='qemu' type='raw'/>

+      <source protocol='http' name='test3.img'>

+        <host name='example.org' port='1234'/>

+      </source>

+      <target dev='vdc' bus='virtio'/>

+    </disk>

+    <disk type='network' device='disk'>

+      <driver name='qemu' type='raw'/>

+      <source protocol='https' name='test4.img'>

+        <host name='example.org' port='1234'/>

+      </source>

+      <target dev='vdd' bus='virtio'/>

+    </disk>

+    <controller type='usb' 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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c

index 265ffce465..7bc01d55d5 100644

--- a/tests/qemuxml2argvtest.c

+++ b/tests/qemuxml2argvtest.c

@@ -1089,6 +1089,7 @@ mymain(void)

             QEMU_CAPS_OBJECT_TLS_CREDS_X509, QEMU_CAPS_NBD_TLS);

     DO_TEST_CAPS_VER("disk-network-tlsx509", "2.12.0");

     DO_TEST_CAPS_LATEST("disk-network-tlsx509");

+    DO_TEST_CAPS_LATEST("disk-network-http");

     driver.config->vxhsTLS = 0;

     VIR_FREE(driver.config->vxhsTLSx509certdir);

     DO_TEST("disk-no-boot", NONE);

-- 

2.25.1