a41c76
From 566b77b94d498426062dfddaf5a8c77250ba0857 Mon Sep 17 00:00:00 2001
a41c76
Message-Id: <566b77b94d498426062dfddaf5a8c77250ba0857@dist-git>
a41c76
From: Peter Krempa <pkrempa@redhat.com>
a41c76
Date: Mon, 16 Mar 2020 22:12:00 +0100
a41c76
Subject: [PATCH] qemuxml2argvtest: Add test case for disks with http(s) source
a41c76
MIME-Version: 1.0
a41c76
Content-Type: text/plain; charset=UTF-8
a41c76
Content-Transfer-Encoding: 8bit
a41c76
a41c76
Upcoming patches will implement the support for sslverify, cookies,
a41c76
readahead, and timeout properties. Add a test file which will collect
a41c76
the cases.
a41c76
a41c76
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
a41c76
Reviewed-by: Ján Tomko <jtomko@redhat.com>
a41c76
(cherry picked from commit 3dd7952f6f996d13a0a685e1300c178fd9be6658)
a41c76
a41c76
 Conflicts:
a41c76
  tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args:
a41c76
  Test output differs on the '-cpu qemu64' line due to previous fixes
a41c76
  to the testsuite not being backported
a41c76
a41c76
https://bugzilla.redhat.com/show_bug.cgi?id=1804750
a41c76
Message-Id: <4ff67b442d284d3e8cdc9564b9378990b57fa3c0.1584391727.git.pkrempa@redhat.com>
a41c76
Reviewed-by: Ján Tomko <jtomko@redhat.com>
a41c76
---
a41c76
 .../disk-network-http.x86_64-latest.args      | 56 +++++++++++++++++++
a41c76
 tests/qemuxml2argvdata/disk-network-http.xml  | 50 +++++++++++++++++
a41c76
 tests/qemuxml2argvtest.c                      |  1 +
a41c76
 3 files changed, 107 insertions(+)
a41c76
 create mode 100644 tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
a41c76
 create mode 100644 tests/qemuxml2argvdata/disk-network-http.xml
a41c76
a41c76
diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
a41c76
new file mode 100644
a41c76
index 0000000000..d39f357072
a41c76
--- /dev/null
a41c76
+++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
a41c76
@@ -0,0 +1,56 @@
a41c76
+LC_ALL=C \
a41c76
+PATH=/bin \
a41c76
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
a41c76
+USER=test \
a41c76
+LOGNAME=test \
a41c76
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
a41c76
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
a41c76
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
a41c76
+QEMU_AUDIO_DRV=none \
a41c76
+/usr/bin/qemu-system-x86_64 \
a41c76
+-name guest=QEMUGuest1,debug-threads=on \
a41c76
+-S \
a41c76
+-object secret,id=masterKey0,format=raw,\
a41c76
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
a41c76
+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
a41c76
+-m 214 \
a41c76
+-overcommit mem-lock=off \
a41c76
+-smp 1,sockets=1,cores=1,threads=1 \
a41c76
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
a41c76
+-display none \
a41c76
+-no-user-config \
a41c76
+-nodefaults \
a41c76
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
a41c76
+-mon chardev=charmonitor,id=monitor,mode=control \
a41c76
+-rtc base=utc \
a41c76
+-no-shutdown \
a41c76
+-no-acpi \
a41c76
+-boot strict=on \
a41c76
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
a41c76
+-blockdev '{"driver":"http","url":"http://example.org:80/test.img",\
a41c76
+"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
a41c76
+-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
a41c76
+"file":"libvirt-4-storage"}' \
a41c76
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
a41c76
+id=virtio-disk0,bootindex=1 \
a41c76
+-blockdev '{"driver":"https","url":"https://example.org:443/test2.img",\
a41c76
+"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
a41c76
+-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
a41c76
+"file":"libvirt-3-storage"}' \
a41c76
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
a41c76
+id=virtio-disk1 \
a41c76
+-blockdev '{"driver":"http","url":"http://example.org:1234/test3.img",\
a41c76
+"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
a41c76
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
a41c76
+"file":"libvirt-2-storage"}' \
a41c76
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
a41c76
+id=virtio-disk2 \
a41c76
+-blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\
a41c76
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
a41c76
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
a41c76
+"file":"libvirt-1-storage"}' \
a41c76
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-1-format,\
a41c76
+id=virtio-disk3 \
a41c76
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
a41c76
+resourcecontrol=deny \
a41c76
+-msg timestamp=on
a41c76
diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml
a41c76
new file mode 100644
a41c76
index 0000000000..83a9865c83
a41c76
--- /dev/null
a41c76
+++ b/tests/qemuxml2argvdata/disk-network-http.xml
a41c76
@@ -0,0 +1,50 @@
a41c76
+<domain type='kvm'>
a41c76
+  <name>QEMUGuest1</name>
a41c76
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
a41c76
+  <memory unit='KiB'>219136</memory>
a41c76
+  <currentMemory unit='KiB'>219136</currentMemory>
a41c76
+  <vcpu placement='static'>1</vcpu>
a41c76
+  <os>
a41c76
+    <type arch='x86_64' machine='pc'>hvm</type>
a41c76
+    <boot dev='hd'/>
a41c76
+  </os>
a41c76
+  <clock offset='utc'/>
a41c76
+  <on_poweroff>destroy</on_poweroff>
a41c76
+  <on_reboot>restart</on_reboot>
a41c76
+  <on_crash>destroy</on_crash>
a41c76
+  <devices>
a41c76
+    <disk type='network' device='disk'>
a41c76
+      <driver name='qemu' type='raw'/>
a41c76
+      <source protocol='http' name='test.img'>
a41c76
+        <host name='example.org'/>
a41c76
+      </source>
a41c76
+      <target dev='vda' bus='virtio'/>
a41c76
+    </disk>
a41c76
+    <disk type='network' device='disk'>
a41c76
+      <driver name='qemu' type='raw'/>
a41c76
+      <source protocol='https' name='test2.img'>
a41c76
+        <host name='example.org'/>
a41c76
+      </source>
a41c76
+      <target dev='vdb' bus='virtio'/>
a41c76
+    </disk>
a41c76
+    <disk type='network' device='disk'>
a41c76
+      <driver name='qemu' type='raw'/>
a41c76
+      <source protocol='http' name='test3.img'>
a41c76
+        <host name='example.org' port='1234'/>
a41c76
+      </source>
a41c76
+      <target dev='vdc' bus='virtio'/>
a41c76
+    </disk>
a41c76
+    <disk type='network' device='disk'>
a41c76
+      <driver name='qemu' type='raw'/>
a41c76
+      <source protocol='https' name='test4.img'>
a41c76
+        <host name='example.org' port='1234'/>
a41c76
+      </source>
a41c76
+      <target dev='vdd' bus='virtio'/>
a41c76
+    </disk>
a41c76
+    <controller type='usb' index='0'/>
a41c76
+    <controller type='pci' index='0' model='pci-root'/>
a41c76
+    <input type='mouse' bus='ps2'/>
a41c76
+    <input type='keyboard' bus='ps2'/>
a41c76
+    <memballoon model='none'/>
a41c76
+  </devices>
a41c76
+</domain>
a41c76
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
a41c76
index 265ffce465..7bc01d55d5 100644
a41c76
--- a/tests/qemuxml2argvtest.c
a41c76
+++ b/tests/qemuxml2argvtest.c
a41c76
@@ -1089,6 +1089,7 @@ mymain(void)
a41c76
             QEMU_CAPS_OBJECT_TLS_CREDS_X509, QEMU_CAPS_NBD_TLS);
a41c76
     DO_TEST_CAPS_VER("disk-network-tlsx509", "2.12.0");
a41c76
     DO_TEST_CAPS_LATEST("disk-network-tlsx509");
a41c76
+    DO_TEST_CAPS_LATEST("disk-network-http");
a41c76
     driver.config->vxhsTLS = 0;
a41c76
     VIR_FREE(driver.config->vxhsTLSx509certdir);
a41c76
     DO_TEST("disk-no-boot", NONE);
a41c76
-- 
a41c76
2.25.1
a41c76