[libvirt PATCH 1/2] tests: use RBD instead of sheepdog

Pavel Hrdina phrdina at redhat.com
Mon Apr 19 10:47:58 UTC 2021


We will drop support for sheepdog in libvirt so we should not use it in
tests.

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 tests/qemuxml2argvdata/boot-dev+order.xml | 2 +-
 tests/qemuxml2argvdata/boot-order.args    | 2 +-
 tests/qemuxml2argvdata/boot-order.xml     | 2 +-
 tests/qemuxml2xmloutdata/boot-order.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxml2argvdata/boot-dev+order.xml
index e4bb3b1f48..95209b979f 100644
--- a/tests/qemuxml2argvdata/boot-dev+order.xml
+++ b/tests/qemuxml2argvdata/boot-dev+order.xml
@@ -30,7 +30,7 @@
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
-      <source protocol='sheepdog' name='image'>
+      <source protocol='rbd' name='pool/image'>
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vda' bus='virtio'/>
diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index fc2d3135f9..6068d13e11 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -28,7 +28,7 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--drive file=sheepdog:example.org:6000:image,format=raw,if=none,id=drive-virtio-disk0 \
+-drive 'file=rbd:pool/image:auth_supported=none:mon_host=example.org\:6000,format=raw,if=none,id=drive-virtio-disk0' \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
 -drive file=/dev/null,format=raw,if=none,id=drive-fdc0-0-1 \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxml2argvdata/boot-order.xml
index 6a95658ad2..08e4f9cd6d 100644
--- a/tests/qemuxml2argvdata/boot-order.xml
+++ b/tests/qemuxml2argvdata/boot-order.xml
@@ -27,7 +27,7 @@
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
-      <source protocol='sheepdog' name='image'>
+      <source protocol='rbd' name='pool/image'>
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vda' bus='virtio'/>
diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml
index bdd7e1b16f..1bf6fe8640 100644
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.xml
@@ -29,7 +29,7 @@
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
-      <source protocol='sheepdog' name='image'>
+      <source protocol='rbd' name='pool/image'>
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vda' bus='virtio'/>
-- 
2.30.2




More information about the libvir-list mailing list