schema: allow 'ssh' as a protocol for network disks

There was support in the code for parsing protocol='ssh' on network disk
sources, but it was not present in the xml schema. Add this to the
schema.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 1fe9ccb70e338ccaf9e89fd160c46a0190a780f9..13201189916509debcb1f668e952ab5757001fe0 100644 (file)
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -2180,6 +2180,7 @@
           <choice>
             <value>sheepdog</value>
             <value>tftp</value>
+            <value>ssh</value>
           </choice>
         </attribute>
         <attribute name="name"/>

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 9a968477d7fcf9b48f5adb476064d62df92e2f9b..8bad69e7ac86d77f81b96f0a04ed1f565f801b36 100644 (file)
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -1213,7 +1213,7 @@ mymain(void)
 
     TEST_IMAGE_CREATE("network-gluster-qcow2", NULL);
     TEST_IMAGE_CREATE("network-rbd-qcow2", NULL);
-    TEST_IMAGE_CREATE("network-ssh-qcow2-invalid", NULL);
+    TEST_IMAGE_CREATE("network-ssh-qcow2", NULL);
 
 #define TEST_BITMAP_DETECT(testname) \
     do { \

diff --git a/tests/qemublocktestdata/imagecreate/network-ssh-qcow2-invalid.json b/tests/qemublocktestdata/imagecreate/network-ssh-qcow2-invalid.json
deleted file mode 100644 (file)
index d58054c..0000000
--- a/tests/qemublocktestdata/imagecreate/network-ssh-qcow2-invalid.json
+++ /dev/null
@@ -1,19 +0,0 @@
-protocol:
-{
-  "driver": "ssh",
-  "location": {
-    "path": "asdf/i.qcow2",
-    "server": {
-      "host": "example.com",
-      "port": "1234"
-    }
-  },
-  "size": 4294967296
-}
-
-format:
-{
-  "driver": "qcow2",
-  "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 8589934590
-}

diff --git a/tests/qemublocktestdata/imagecreate/network-ssh-qcow2-invalid.xml b/tests/qemublocktestdata/imagecreate/network-ssh-qcow2-invalid.xml
deleted file mode 100644 (file)
index 046f789..0000000
--- a/tests/qemublocktestdata/imagecreate/network-ssh-qcow2-invalid.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<disk device='disk' type='network'>
-  <driver type='qcow2'/>
-  <source protocol='ssh' name='asdf/i.qcow2'>
-    <host name='example.com' port='1234'/>
-    <privateData>
-      <nodenames>
-        <nodename type='storage' name='0123456789ABCDEF0123456789ABCDE'/>
-        <nodename type='format' name='0123456789ABCDEF0123456789ABCDE'/>
-      </nodenames>
-    </privateData>
-  </source>
-</disk>

diff --git a/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json b/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json
new file mode 100644 (file)
index 0000000..d58054c
--- /dev/null
+++ b/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json
@@ -0,0 +1,19 @@
+protocol:
+{
+  "driver": "ssh",
+  "location": {
+    "path": "asdf/i.qcow2",
+    "server": {
+      "host": "example.com",
+      "port": "1234"
+    }
+  },
+  "size": 4294967296
+}
+
+format:
+{
+  "driver": "qcow2",
+  "file": "0123456789ABCDEF0123456789ABCDE",
+  "size": 8589934590
+}

diff --git a/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.xml b/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.xml
new file mode 100644 (file)
index 0000000..046f789
--- /dev/null
+++ b/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.xml
@@ -0,0 +1,12 @@
+<disk device='disk' type='network'>
+  <driver type='qcow2'/>
+  <source protocol='ssh' name='asdf/i.qcow2'>
+    <host name='example.com' port='1234'/>
+    <privateData>
+      <nodenames>
+        <nodename type='storage' name='0123456789ABCDEF0123456789ABCDE'/>
+        <nodename type='format' name='0123456789ABCDEF0123456789ABCDE'/>
+      </nodenames>
+    </privateData>
+  </source>
+</disk>

diff --git a/tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args
new file mode 100644 (file)
index 0000000..b7fd300
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args
@@ -0,0 +1,35 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel kvm \
+-cpu qemu64 \
+-m size=219136k \
+-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 \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"ssh","path":"test.img","server":{"host":"example.org","port":"2222"},"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on

diff --git a/tests/qemuxml2argvdata/disk-network-ssh.xml b/tests/qemuxml2argvdata/disk-network-ssh.xml
new file mode 100644 (file)
index 0000000..355add4
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-network-ssh.xml
@@ -0,0 +1,31 @@
+<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='ssh' name='test.img'>
+        <host name='example.org' port='2222'/>
+        <timeout seconds='1234'/>
+        <readahead size='1024'/>
+      </source>
+      <target dev='vda' 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 c3f05e83b99a7963e1a1933281a97c0bea5b7ec8..3bf4754011118b8075a8d35f2592319e76e7dea5 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1156,6 +1156,7 @@ mymain(void)
     VIR_FREE(driver.config->nbdTLSx509secretUUID);
     VIR_FREE(driver.config->vxhsTLSx509secretUUID);
     driver.config->vxhsTLS = 0;
+    DO_TEST_CAPS_LATEST("disk-network-ssh");
     DO_TEST_CAPS_LATEST("disk-no-boot");
     DO_TEST_CAPS_LATEST("disk-nvme");
     DO_TEST_CAPS_VER("disk-vhostuser-numa", "4.2.0");