[PATCH 04/10] qemuxmlconftest: Use only 'nfs' protocol in 'disk-network-nfs'

Convert one of the layers of the backing chain to 'nfs' to test if users don't set the identity. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml | 4 ++-- tests/qemuxmlconfdata/disk-network-nfs.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args index a32475eadf..62f56b146f 100644 --- a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-3-storage","id":"virtio-disk0","bootindex":1,"write-cache":"on","serial":"eb90327c-8302-4725-9e1b-4e85ed4dc251"}' \ -blockdev '{"driver":"nfs","server":{"host":"example.org","type":"inet"},"path":"/backing/store/nfs","user":1234,"group":5678,"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow2","file":"libvirt-2-storage","backing":null}' \ --blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":[{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"nfs","server":{"host":"example.org","type":"inet"},"path":"/Volume2/Image","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-1-format","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml index 19e269c531..b0fb80d7f1 100644 --- a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml @@ -29,8 +29,8 @@ </disk> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> - <source protocol='gluster' name='Volume2/Image'> - <host transport='unix' socket='/path/to/sock'/> + <source protocol='nfs' name='/Volume2/Image'> + <host name='example.org'/> </source> <backingStore type='network'> <format type='qcow2'/> diff --git a/tests/qemuxmlconfdata/disk-network-nfs.xml b/tests/qemuxmlconfdata/disk-network-nfs.xml index 328afbc46c..b7f0e26451 100644 --- a/tests/qemuxmlconfdata/disk-network-nfs.xml +++ b/tests/qemuxmlconfdata/disk-network-nfs.xml @@ -26,8 +26,8 @@ </disk> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> - <source protocol='gluster' name='Volume2/Image'> - <host transport='unix' socket='/path/to/sock'/> + <source protocol='nfs' name='/Volume2/Image'> + <host name='example.org'/> </source> <backingStore type='network'> <format type='qcow2'/> -- 2.46.2