shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-08 21:18:04 +03:00
Code Issues Projects Releases Wiki Activity

tests: testdriver: Rename default-pool -> pool-dir

Browse Source 
And move the path to not be rooted in /dev, which doesn't make
sense for a directory pool, and triggers some special /dev handling
in virtinst that we don't want in the common testing path.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2022-02-27 13:00:56 -05:00
parent 6a21b38ae8
commit 435c7181f1
92 changed files with 264 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/data/cli/compare/virt-clone-auto-managed.xml
View File

@ -15,7 +15,7 @@
<devices>
<disk type="file" device="disk">
<target dev="hda" bus="ide"/>
<source file="/dev/default-pool/default-vol-clone"/>
<source file="/pool-dir/default-vol-clone"/>
</disk>
<disk type="file" device="floppy">
<target dev="fda" bus="fdc"/>

6
tests/data/cli/compare/virt-clone-clone-auto1.xml
View File

@ -38,18 +38,18 @@
</disk>
<disk type="block" device="disk">
<driver type="qcow2"/>
<source dev="/dev/default-pool/collidevol1.img"/>
<source dev="/pool-dir/collidevol1.img"/>
<target dev="sdc" bus="scsi"/>
<shareable/>
<address type="drive" controller="0" bus="0" target="0" unit="2"/>
</disk>
<disk type="file" device="disk">
<source file="/dev/default-pool/default-vol-clone"/>
<source file="/pool-dir/default-vol-clone"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol9-clone.img"/>
<source file="/pool-dir/testvol9-clone.img"/>
<target dev="hdb" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="1"/>
</disk>

2
tests/data/cli/compare/virt-clone-clone-auto2.xml
View File

@ -21,7 +21,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<driver type="qcow2"/>
<source file="/dev/default-pool/newvm.img"/>
<source file="/pool-dir/newvm.img"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>

6
tests/data/cli/compare/virt-clone-clone-manual.xml
View File

@ -38,18 +38,18 @@
</disk>
<disk type="block" device="disk">
<driver type="qcow2"/>
<source dev="/dev/default-pool/collidevol1.img"/>
<source dev="/pool-dir/collidevol1.img"/>
<target dev="sdc" bus="scsi"/>
<shareable/>
<address type="drive" controller="0" bus="0" target="0" unit="2"/>
</disk>
<disk type="file" device="disk">
<source file="/dev/default-pool/newclone3.img"/>
<source file="/pool-dir/newclone3.img"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol9.img"/>
<source file="/pool-dir/testvol9.img"/>
<target dev="hdb" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="1"/>
</disk>

6
tests/data/cli/compare/virt-clone-replace.xml
View File

@ -38,18 +38,18 @@
</disk>
<disk type="block" device="disk">
<driver type="qcow2"/>
<source dev="/dev/default-pool/collidevol1.img"/>
<source dev="/pool-dir/collidevol1.img"/>
<target dev="sdc" bus="scsi"/>
<shareable/>
<address type="drive" controller="0" bus="0" target="0" unit="2"/>
</disk>
<disk type="file" device="disk">
<source file="/dev/default-pool/default-vol-clone"/>
<source file="/pool-dir/default-vol-clone"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol9-clone.img"/>
<source file="/pool-dir/testvol9-clone.img"/>
<target dev="hdb" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="1"/>
</disk>

2
tests/data/cli/compare/virt-clone-unmanaged-preserve.xml
View File

@ -19,7 +19,7 @@
</disk>
<disk type="file" device="disk">
<target dev="hdb" bus="ide"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
</disk>
<disk type="file" device="cdrom">
<target dev="hdc" bus="ide"/>

4
tests/data/cli/compare/virt-install-aarch64-cdrom.xml
View File

@ -27,7 +27,7 @@
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">
@ -97,7 +97,7 @@
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">

2
tests/data/cli/compare/virt-install-aarch64-kvm-import.xml
View File

@ -20,7 +20,7 @@
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-aarch64-machdefault.xml
View File

@ -26,7 +26,7 @@
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-aarch64-machvirt.xml
View File

@ -26,7 +26,7 @@
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-arm-defaultmach-f20.xml
View File

@ -20,7 +20,7 @@
<emulator>/usr/bin/qemu-system-arm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-arm-kvm-import.xml
View File

@ -20,7 +20,7 @@
<emulator>/usr/bin/qemu-system-arm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-arm-vexpress-plain.xml
View File

@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu-system-arm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sda" bus="sd"/>
</disk>
<interface type="bridge">

2
tests/data/cli/compare/virt-install-arm-virt-f20.xml
View File

@ -20,7 +20,7 @@
<emulator>/usr/bin/qemu-system-arm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

4
tests/data/cli/compare/virt-install-cdrom-centos-label.xml
View File

@ -34,7 +34,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">
@ -112,7 +112,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">

6
tests/data/cli/compare/virt-install-cdrom-double.xml
View File

@ -25,12 +25,12 @@
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<disk type="file" device="cdrom">
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
@ -80,7 +80,7 @@
<readonly/>
</disk>
<disk type="file" device="cdrom">
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>

4
tests/data/cli/compare/virt-install-cloud-init-default.xml
View File

@ -24,7 +24,7 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
@ -75,7 +75,7 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">

4
tests/data/cli/compare/virt-install-cloud-init-options.xml
View File

@ -24,7 +24,7 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
@ -75,7 +75,7 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">

2
tests/data/cli/compare/virt-install-f21-kvm-remote.xml
View File

@ -32,7 +32,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

4
tests/data/cli/compare/virt-install-kvm-centos7.xml
View File

@ -34,7 +34,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>
@ -101,7 +101,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

4
tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml
View File

@ -36,7 +36,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>
@ -104,7 +104,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

4
tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml
View File

@ -35,7 +35,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>
@ -107,7 +107,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

4
tests/data/cli/compare/virt-install-kvm-rhel5.xml
View File

@ -34,7 +34,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" model="ich9-ehci1"/>
@ -102,7 +102,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" model="ich9-ehci1"/>

4
tests/data/cli/compare/virt-install-kvm-rhel6.xml
View File

@ -35,7 +35,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="ich9-ehci1"/>
@ -107,7 +107,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="ich9-ehci1"/>

4
tests/data/cli/compare/virt-install-kvm-rhel7.xml
View File

@ -35,7 +35,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>
@ -101,7 +101,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-kvm-session-defaults.xml
View File

@ -39,7 +39,7 @@
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
<readonly/>
</disk>

8
tests/data/cli/compare/virt-install-kvm-win10.xml
View File

@ -40,12 +40,12 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sda" bus="sata"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
@ -114,12 +114,12 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sda" bus="sata"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>

8
tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -40,12 +40,12 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
@ -111,12 +111,12 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>

4
tests/data/cli/compare/virt-install-location-iso.xml
View File

@ -34,7 +34,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">
@ -111,7 +111,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">

12
tests/data/cli/compare/virt-install-many-devices.xml
View File

@ -218,7 +218,7 @@
<emulator>/new/emu</emulator>
<disk type="block" device="disk">
<driver name="qemu" type="raw" cache="writeback" discard="unmap" io="threads" iothread="3" queues="8"/>
<source dev="/dev/default-pool/UPPER"/>
<source dev="/pool-dir/UPPER"/>
<target dev="vda" bus="virtio"/>
<serial>WD-WMAP9A966149</serial>
<wwn>123456789abcdefa</wwn>
@ -227,7 +227,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2" detect_zeroes="unmap" error_policy="enospace"/>
<source file="/dev/default-pool/new1.img"/>
<source file="/pool-dir/new1.img"/>
<target dev="vdb" bus="virtio"/>
<address type="drive" controller="0" target="2" unit="0"/>
<readonly/>
@ -260,7 +260,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/dev/default-pool/iso-vol">
<source file="/pool-dir/iso-vol">
<seclabel model="dac">
<label>foo,bar,baz</label>
</seclabel>
@ -276,7 +276,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/dev/default-pool/iso-vol" startupPolicy="optional"/>
<source file="/pool-dir/iso-vol" startupPolicy="optional"/>
<target dev="vde" bus="virtio"/>
<iotune>
<total_bytes_sec>10</total_bytes_sec>
@ -365,7 +365,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2" discard="unmap"/>
<source file="/dev/default-pool/new2.img"/>
<source file="/pool-dir/new2.img"/>
<target dev="sdad" bus="usb" removable="on"/>
</disk>
<disk type="file" device="disk">
@ -403,7 +403,7 @@
</disk>
<disk type="dir" device="disk">
<driver name="qemu" type="qcow2"/>
<source dir="/dev/default-pool/testvol1.img"/>
<source dir="/pool-dir/testvol1.img"/>
<target dev="vdr" bus="virtio"/>
</disk>
<disk type="file" device="disk">

4
tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml
View File

@ -33,7 +33,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>
@ -101,7 +101,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

4
tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
View File

@ -34,7 +34,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="disk">
@ -107,7 +107,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="disk">

2
tests/data/cli/compare/virt-install-ppc64-machdefault-f20.xml
View File

@ -18,7 +18,7 @@
<emulator>/usr/bin/qemu-system-ppc64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-ppc64-pseries-f20.xml
View File

@ -18,7 +18,7 @@
<emulator>/usr/bin/qemu-system-ppc64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">

2
tests/data/cli/compare/virt-install-ppc64le-kvm-import.xml
View File

@ -18,7 +18,7 @@
<emulator>/usr/libexec/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

6
tests/data/cli/compare/virt-install-q35-defaults.xml
View File

@ -29,12 +29,12 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sda" bus="sata"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
@ -113,7 +113,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sda" bus="sata"/>
</disk>
<disk type="file" device="cdrom">

4
tests/data/cli/compare/virt-install-reinstall-location.xml
View File

@ -23,7 +23,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<driver type="qcow2"/>
<source file="/dev/default-pool/test-clone-simple.img"/>
<source file="/pool-dir/test-clone-simple.img"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>
@ -72,7 +72,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<driver type="qcow2"/>
<source file="/dev/default-pool/test-clone-simple.img"/>
<source file="/pool-dir/test-clone-simple.img"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>

4
tests/data/cli/compare/virt-install-reinstall-pxe.xml
View File

@ -22,7 +22,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<driver type="qcow2"/>
<source file="/dev/default-pool/test-clone-simple.img"/>
<source file="/pool-dir/test-clone-simple.img"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>
@ -66,7 +66,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<driver type="qcow2"/>
<source file="/dev/default-pool/test-clone-simple.img"/>
<source file="/pool-dir/test-clone-simple.img"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>

2
tests/data/cli/compare/virt-install-riscv64-graphics.xml
View File

@ -18,7 +18,7 @@
<emulator>/usr/bin/qemu-system-riscv64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-riscv64-headless.xml
View File

@ -18,7 +18,7 @@
<emulator>/usr/bin/qemu-system-riscv64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" model="qemu-xhci" ports="15"/>

2
tests/data/cli/compare/virt-install-s390x-cdrom.xml
View File

@ -19,7 +19,7 @@
<emulator>/usr/bin/qemu-system-s390x</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">

2
tests/data/cli/compare/virt-install-s390x-headless.xml
View File

@ -18,7 +18,7 @@
<emulator>/usr/bin/qemu-system-s390x</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<interface type="bridge">

54
tests/data/cli/compare/virt-install-storage-creation.xml
View File

@ -32,133 +32,133 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2" discard="unmap"/>
<source file="/dev/default-pool/disk.qcow2"/>
<source file="/pool-dir/disk.qcow2"/>
<target dev="vdb" bus="virtio"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2" discard="unmap"/>
<source file="/dev/default-pool/disk-1.qcow2"/>
<source file="/pool-dir/disk-1.qcow2"/>
<target dev="vdc" bus="virtio"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hdc" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hdd" bus="ide"/>
<readonly/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sda" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdb" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdc" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdd" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sde" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdf" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdg" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdh" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdi" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdj" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdk" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdl" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdm" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdn" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdo" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdp" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sdq" bus="scsi"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw" discard="unmap"/>
<source file="/dev/default-pool/new1.img"/>
<source file="/pool-dir/new1.img"/>
<target dev="vdd" bus="virtio"/>
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2" discard="unmap"/>
<source file="/dev/default-pool/new2.img"/>
<source file="/pool-dir/new2.img"/>
<target dev="vde" bus="virtio"/>
</disk>
<disk type="file" device="disk">
@ -178,7 +178,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/dev/default-pool/sharevol.img"/>
<source file="/pool-dir/sharevol.img"/>
<target dev="vdi" bus="virtio"/>
<shareable/>
</disk>

4
tests/data/cli/compare/virt-install-unattended-remote-cdrom.xml
View File

@ -30,7 +30,7 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="cdrom">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
@ -87,7 +87,7 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="cdrom">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
<readonly/>
</disk>

8
tests/data/cli/compare/virt-install-w2k3-cdrom.xml
View File

@ -34,11 +34,11 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
@ -84,11 +84,11 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>

8
tests/data/cli/compare/virt-install-win7-uefi.xml
View File

@ -42,12 +42,12 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sda" bus="sata"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
@ -142,12 +142,12 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="sda" bus="sata"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<source file="/pool-dir/testvol2.img"/>
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>

2
tests/data/cli/compare/virt-install-xen-default.xml
View File

@ -11,7 +11,7 @@
<devices>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type="bridge">

2
tests/data/cli/compare/virt-install-xen-hvm.xml
View File

@ -25,7 +25,7 @@
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>

4
tests/data/cli/compare/virt-install-xen-pv.xml
View File

@ -18,7 +18,7 @@
<devices>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<controller type="xenbus" maxGrantFrames="64"/>
@ -49,7 +49,7 @@
<devices>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<controller type="xenbus" maxGrantFrames="64"/>

2
tests/data/cli/compare/virt-xml-add-disk-basic-start.xml
View File

@ -2,7 +2,7 @@
</video>
<memballoon model="virtio"/>
+ <disk type="file" device="disk">
+ <source file="/dev/default-pool/testvol1.img"/>
+ <source file="/pool-dir/testvol1.img"/>
+ <target dev="vdf" bus="virtio"/>
+ </disk>
</devices>

2
tests/data/cli/compare/virt-xml-add-disk-basic.xml
View File

@ -2,7 +2,7 @@
<cid auto="no" address="5"/>
</vsock>
+ <disk type="file" device="disk">
+ <source file="/dev/default-pool/testvol1.img"/>
+ <source file="/pool-dir/testvol1.img"/>
+ <target dev="vdf" bus="virtio"/>
+ </disk>
</devices>

2
tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml
View File

@ -2,7 +2,7 @@
</video>
<memballoon model="virtio"/>
+ <disk type="file" device="disk">
+ <source file="/dev/default-pool/new1.img"/>
+ <source file="/pool-dir/new1.img"/>
+ <target dev="hdd" bus="ide"/>
+ </disk>
</devices>

2
tests/data/cli/compare/virt-xml-add-disk-create-storage.xml
View File

@ -2,7 +2,7 @@
<cid auto="no" address="5"/>
</vsock>
+ <disk type="file" device="disk">
+ <source file="/dev/default-pool/new1.img"/>
+ <source file="/pool-dir/new1.img"/>
+ <target dev="hdb" bus="ide"/>
+ </disk>
</devices>

2
tests/data/cli/compare/virt-xml-add-disk-notarget.xml
View File

@ -2,7 +2,7 @@
<cid auto="no" address="5"/>
</vsock>
+ <disk type="file" device="disk">
+ <source file="/dev/default-pool/testvol1.img"/>
+ <source file="/pool-dir/testvol1.img"/>
+ <target dev="hdb" bus="ide"/>
+ </disk>
</devices>

2
tests/data/cli/compare/virt-xml-build-disk-domain.xml
View File

@ -1,5 +1,5 @@
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="vdag" bus="virtio"/>
</disk>

2
tests/data/cli/compare/virt-xml-build-disk-plain.xml
View File

@ -1,5 +1,5 @@
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>

2
tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml
View File

@ -6,7 +6,7 @@
<features>
<acpi/>
@@
<source file="/dev/default-pool/collidevol1.img"/>
<source file="/pool-dir/collidevol1.img"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
+ <boot order="1"/>

2
tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml
View File

@ -3,7 +3,7 @@
<devices>
+ <disk type="file" device="disk">
+ <driver name="qemu" type="qcow2"/>
+ <source file="/dev/default-pool/testvol1.img"/>
+ <source file="/pool-dir/testvol1.img"/>
+ <target dev="vda" bus="virtio"/>
+ </disk>
</devices>

2
tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml
View File

@ -3,7 +3,7 @@
<devices>
+ <disk type="file" device="disk">
+ <driver name="qemu" type="qcow2"/>
+ <source file="/dev/default-pool/testvol1.img"/>
+ <source file="/pool-dir/testvol1.img"/>
+ <target dev="hda" bus="ide"/>
+ </disk>
</devices>

2
tests/data/cli/virtclone/clone-disk-managed.xml
View File

@ -15,7 +15,7 @@
<devices>
<disk type='file' device='disk'>
<target dev='hda' bus='ide'/>
<source file='/dev/default-pool/default-vol'/>
<source file='/pool-dir/default-vol'/>
</disk>
<disk type='file' device='floppy'>
<target dev='fda' bus='fdc'/>

6
tests/data/storage/pool-dir.xml
View File

@ -1,6 +0,0 @@
<pool type="dir">
<name>pool-dir</name>
<target>
<path>/var/lib/libvirt/images/pool-dir</path>
</target>
</pool>

2
tests/data/storage/pool-dir-vol.xml → tests/data/storage/pool-dir2-vol.xml
View File

@ -1,5 +1,5 @@
<volume>
<name>pool-dir-vol</name>
<name>pool-dir2-vol</name>
<capacity>10737418240</capacity>
<allocation>5368709120</allocation>
<target>

6
tests/data/storage/pool-dir-volclone.xml → tests/data/storage/pool-dir2-volclone.xml
View File

@ -1,10 +1,10 @@
<volume type="file">
<name>pool-dir-volclone</name>
<key>/var/lib/libvirt/images/pool-dir/pool-dir-vol</key>
<name>pool-dir2-volclone</name>
<key>/var/lib/libvirt/images/pool-dir2/pool-dir2-vol</key>
<capacity unit="bytes">10737418240</capacity>
<allocation unit="bytes">5368709120</allocation>
<target>
<path>/var/lib/libvirt/images/pool-dir/pool-dir-vol</path>
<path>/var/lib/libvirt/images/pool-dir2/pool-dir2-vol</path>
<format type="raw"/>
<permissions>
<mode>0700</mode>

2
tests/data/storage/pool-dir-volinput.xml → tests/data/storage/pool-dir2-volinput.xml
View File

@ -1,5 +1,5 @@
<volume>
<name>pool-dir-volinput</name>
<name>pool-dir2-volinput</name>
<capacity>10737418240</capacity>
<allocation>5368709120</allocation>
<target>

6
tests/data/storage/pool-dir2.xml Normal file
View File

@ -0,0 +1,6 @@
<pool type="dir">
<name>pool-dir2</name>
<target>
<path>/var/lib/libvirt/images/pool-dir2</path>
</target>
</pool>

2
tests/data/testdriver/defaultpool-collision.xml
View File

@ -27,7 +27,7 @@
<pool type='dir'>
<name>default-pool-path-collision</name>
<name>pool-dir-path-collision</name>
<uuid>35bb2ad9-388a-cdfe-461a-b8907f6e53fe</uuid>
<capacity>107374182400</capacity>
<allocation>0</allocation>

4
tests/data/testdriver/testdefault.xml
View File

@ -62,7 +62,7 @@
<pool type='dir'>
<name>default-pool</name>
<name>pool-dir</name>
<uuid>dfe224cb-28fb-8dd0-c4b2-64eb3f0f4566</uuid>
<capacity unit='bytes'>107374182400</capacity>
<allocation unit='bytes'>0</allocation>
@ -70,7 +70,7 @@
<source>
</source>
<target>
<path>/default-pool</path>
<path>/pool-dir</path>
</target>
</pool>

56
tests/data/testdriver/testdriver.xml
View File

@ -47,9 +47,9 @@
<cpu mode='host-passthrough'/>
<os>
<type arch="i686">hvm</type>
<kernel>/dev/default-pool/test-arm-kernel</kernel>
<initrd>/dev/default-pool/test-arm-initrd</initrd>
<dtb>/dev/default-pool/test-arm-dtb</dtb>
<kernel>/pool-dir/test-arm-kernel</kernel>
<initrd>/pool-dir/test-arm-initrd</initrd>
<dtb>/pool-dir/test-arm-dtb</dtb>
<cmdline>console=ttyAMA0 rw root=/dev/vda3</cmdline>
</os>
</domain>
@ -205,7 +205,7 @@ Foo bar baz &amp; yeah boii &lt; &gt; yeahfoo
<target dev='fdb' bus='fdc'/>
</disk>
<disk type='dir' device='floppy'>
<source dir='/dev/default-pool/test-clone-simple.img'/>
<source dir='/pool-dir/test-clone-simple.img'/>
<target dev='fdc' bus='fdc'/>
</disk>
@ -231,7 +231,7 @@ Foo bar baz &amp; yeah boii &lt; &gt; yeahfoo
<!-- bus scsi -->
<disk type='file' device='cdrom'>
<target dev='sdb' bus='scsi'/>
<source file='/dev/default-pool/sharevol.img'/>
<source file='/pool-dir/sharevol.img'/>
<address type='drive' controller='5'/>
<shareable/>
</disk>
@ -253,7 +253,7 @@ Foo bar baz &amp; yeah boii &lt; &gt; yeahfoo
<target dev='sdc' bus='scsi'/>
</disk>
<disk type='file' device='cdrom'>
<source file='/dev/default-pool/testvol2.img'/>
<source file='/pool-dir/testvol2.img'/>
<target dev='sdf' bus='scsi'/>
<readonly/>
</disk>
@ -318,14 +318,14 @@ Foo bar baz &amp; yeah boii &lt; &gt; yeahfoo
<!-- bus usb -->
<disk type='volume' device='disk'>
<source pool='default-pool' volume='overlay.img'/>
<source pool='pool-dir' volume='overlay.img'/>
<target dev='sdd' bus='usb'/>
</disk>
<!-- bus xen -->
<disk type='file' device='disk'>
<driver name='tap' type='qcow' cache="writethrough"/>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='xvdc' bus='xen'/>
</disk>
@ -793,7 +793,7 @@ test-many-devices, like an alternate RNG, EOL OS ID, title field
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<driver type="qcow2"/>
</disk>
@ -843,17 +843,17 @@ test-many-devices, like an alternate RNG, EOL OS ID, title field
<target dev='sdb' bus='scsi'/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/default-pool/collidevol1.img'/>
<source dev='/pool-dir/collidevol1.img'/>
<target dev='sdc' bus='scsi'/>
<driver type="qcow2"/>
<shareable/>
</disk>
<disk type='file' device='disk'>
<source file='/dev/default-pool/default-vol'/>
<source file='/pool-dir/default-vol'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='file' device='disk'>
<source file='/dev/default-pool/testvol9.img'/>
<source file='/pool-dir/testvol9.img'/>
<target dev='hdb' bus='ide'/>
</disk>
<interface type='network'>
@ -975,7 +975,7 @@ test-many-devices, like an alternate RNG, EOL OS ID, title field
<bootloader>/tmp/bootfoo</bootloader>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
</disk>
<graphics type='vnc'/>
@ -1008,7 +1008,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1046,7 +1046,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1081,7 +1081,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1119,7 +1119,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1157,7 +1157,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1192,7 +1192,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1227,7 +1227,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1264,7 +1264,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1297,7 +1297,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1334,7 +1334,7 @@ ba</description>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
@ -1596,7 +1596,7 @@ ba</description>
<pool type='dir'>
<name>default-pool</name>
<name>pool-dir</name>
<uuid>35bb2ad9-388a-cdfe-461a-b8907f6e53fe</uuid>
<capacity>107374182400</capacity>
<allocation>0</allocation>
@ -1604,7 +1604,7 @@ ba</description>
<source>
</source>
<target>
<path>/dev/default-pool</path>
<path>/pool-dir</path>
<permissions>
<mode>0700</mode>
<owner>10736</owner>
@ -1768,7 +1768,7 @@ ba</description>
<format type='qcow2'/>
</target>
<backingStore>
<path>/dev/default-pool/backingl3.img</path>
<path>/pool-dir/backingl3.img</path>
</backingStore>
</volume>
<volume type='file'>
@ -1779,7 +1779,7 @@ ba</description>
<format type='qcow2'/>
</target>
<backingStore>
<path>/dev/default-pool/backingl2.img</path>
<path>/pool-dir/backingl2.img</path>
</backingStore>
</volume>
<volume type='file'>
@ -1790,7 +1790,7 @@ ba</description>
<format type='qcow2'/>
</target>
<backingStore>
<path>/dev/default-pool/backingl1.img</path>
<path>/pool-dir/backingl1.img</path>
</backingStore>
</volume>

12
tests/data/testdriver/testsuite.xml
View File

@ -82,7 +82,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/dev/default-pool/collidevol1.img'/>
<source file='/pool-dir/collidevol1.img'/>
<target dev='hda' bus='ide'/>
<driver type="qcow2"/>
</disk>
@ -473,7 +473,7 @@
<pool type='dir'>
<name>default-pool</name>
<name>pool-dir</name>
<uuid>35bb2ad9-388a-cdfe-461a-b8907f6e53fe</uuid>
<capacity>107374182400</capacity>
<allocation>0</allocation>
@ -481,7 +481,7 @@
<source>
</source>
<target>
<path>/dev/default-pool</path>
<path>/pool-dir</path>
<permissions>
<mode>0700</mode>
<owner>10736</owner>
@ -619,7 +619,7 @@
<format type='qcow2'/>
</target>
<backingStore>
<path>/dev/default-pool/backingl3.img</path>
<path>/pool-dir/backingl3.img</path>
</backingStore>
</volume>
<volume type='file'>
@ -630,7 +630,7 @@
<format type='qcow2'/>
</target>
<backingStore>
<path>/dev/default-pool/backingl2.img</path>
<path>/pool-dir/backingl2.img</path>
</backingStore>
</volume>
<volume type='file'>
@ -641,7 +641,7 @@
<format type='qcow2'/>
</target>
<backingStore>
<path>/dev/default-pool/backingl1.img</path>
<path>/pool-dir/backingl1.img</path>
</backingStore>
</volume>

2
tests/data/xmlparse/add-devices-in.xml
View File

@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">

2
tests/data/xmlparse/add-devices-out.xml
View File

@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">

2
tests/data/xmlparse/change-devices-bootorder-fixed-out.xml
View File

@ -28,7 +28,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="fda" bus="fdc"/>
<boot order="1"/>
</disk>

2
tests/data/xmlparse/change-devices-bootorder-in.xml
View File

@ -29,7 +29,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">

2
tests/data/xmlparse/change-devices-bootorder-out.xml
View File

@ -28,7 +28,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="fda" bus="fdc"/>
<boot order="1"/>
</disk>

2
tests/data/xmlparse/change-disk-out.xml
View File

@ -61,7 +61,7 @@
<total_bytes_sec>6</total_bytes_sec>
</iotune>
<driver cache="writeback" discard="unmap" detect_zeroes="unmap" io="native"/>
<source file="/dev/default-pool/default-vol" startupPolicy="optional"/>
<source file="/pool-dir/default-vol" startupPolicy="optional"/>
<shareable/>
</disk>
<disk type="block" device="floppy">

2
tests/data/xmlparse/change-guest-in.xml
View File

@ -49,7 +49,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">

2
tests/data/xmlparse/change-guest-out.xml
View File

@ -63,7 +63,7 @@
<emulator>/usr/binnnn/fooemu</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<source file="/pool-dir/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">

4
tests/data/xmlparse/change-media-out.xml
View File

@ -13,7 +13,7 @@
<disk type="file" device="cdrom">
<target dev="hda" bus="ide"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/default-vol"/>
<source file="/pool-dir/default-vol"/>
</disk>
<disk type="block" device="cdrom">
<target dev="hdb" bus="ide"/>
@ -28,7 +28,7 @@
<disk type="file" device="floppy">
<target dev="fda" bus="fdc"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/default-vol"/>
<source file="/pool-dir/default-vol"/>
</disk>
<disk type="block" device="floppy">
<target dev="fdb" bus="fdc"/>

2
tests/data/xmlparse/change-snapshot-in.xml
View File

@ -26,7 +26,7 @@
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/dev/default-pool/test-clone-simple.img'/>
<source file='/pool-dir/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>

2
tests/data/xmlparse/change-snapshot-out.xml
View File

@ -28,7 +28,7 @@ newline
<on_crash>destroy</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/dev/default-pool/test-clone-simple.img"/>
<source file="/pool-dir/test-clone-simple.img"/>
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
</disk>

38
tests/test_cli.py
View File

@ -72,13 +72,13 @@ TEST_DATA = {
'URI-QEMU-RISCV64': utils.URIs.qemu_riscv64,
'XMLDIR': XMLDIR,
'NEWIMG1': "/dev/default-pool/new1.img",
'NEWIMG2': "/dev/default-pool/new2.img",
'NEWIMG1': "/pool-dir/new1.img",
'NEWIMG2': "/pool-dir/new2.img",
'NEWCLONEIMG1': NEW_FILES[0],
'NEWCLONEIMG2': NEW_FILES[1],
'NEWCLONEIMG3': NEW_FILES[2],
'EXISTIMG1': "/dev/default-pool/testvol1.img",
'EXISTIMG2': "/dev/default-pool/testvol2.img",
'EXISTIMG1': "/pool-dir/testvol1.img",
'EXISTIMG2': "/pool-dir/testvol2.img",
'EXISTIMG3': EXIST_FILES[0],
'EXISTIMG4': EXIST_FILES[1],
'ISOTREE': "%s/fake-fedora17-tree.iso" % MEDIA_DIR,
@ -88,7 +88,7 @@ TEST_DATA = {
'ISO-F26-NETINST': "%s/fake-f26-netinst.iso" % MEDIA_DIR,
'ISO-F29-LIVE': "%s/fake-f29-live.iso" % MEDIA_DIR,
'TREEDIR': "%s/fakefedoratree" % MEDIA_DIR,
'COLLIDE': "/dev/default-pool/collidevol1.img",
'COLLIDE': "/pool-dir/collidevol1.img",
'ADMIN-PASSWORD-FILE': "%s/admin-password.txt" % UNATTENDED_DIR,
'USER-PASSWORD-FILE': "%s/user-password.txt" % UNATTENDED_DIR,
}
@ -569,13 +569,13 @@ memorytune0.vcpus=0-3,memorytune0.node0.id=0,memorytune0.node0.bandwidth=60
--sysinfo bios.vendor="Acme LLC",bios.version=1.2.3,bios.date=01/01/1970,bios.release=10.22,system.manufacturer="Acme Inc.",system.product=Computer,system.version=3.2.1,system.serial=123456789,system.uuid=00000000-1111-2222-3333-444444444444,system.sku=abc-123,system.family=Server,baseBoard.manufacturer="Acme Corp.",baseBoard.product=Motherboard,baseBoard.version=A01,baseBoard.serial=1234-5678,baseBoard.asset=Tag,baseBoard.location=Chassis
--disk type=block,source.dev=/dev/default-pool/UPPER,cache=writeback,io=threads,perms=sh,serial=WD-WMAP9A966149,wwn=123456789abcdefa,boot_order=2,driver.iothread=3,driver.queues=8
--disk type=block,source.dev=/pool-dir/UPPER,cache=writeback,io=threads,perms=sh,serial=WD-WMAP9A966149,wwn=123456789abcdefa,boot_order=2,driver.iothread=3,driver.queues=8
--disk source.file=%(NEWIMG1)s,sparse=false,size=.001,perms=ro,error_policy=enospace,detect_zeroes=unmap,address.type=drive,address.controller=0,address.target=2,address.unit=0
--disk device=cdrom,bus=sata,read_bytes_sec=1,read_iops_sec=2,write_bytes_sec=5,write_iops_sec=6,driver.copy_on_read=on,geometry.cyls=16383,geometry.heads=16,geometry.secs=63,geometry.trans=lba,discard=ignore
--disk size=1
--disk /iscsi-pool/diskvol1,total_bytes_sec=10,total_iops_sec=20,bus=scsi,device=lun,sgio=unfiltered,rawio=yes
--disk /dev/default-pool/iso-vol,seclabel.model=dac,seclabel1.model=selinux,seclabel1.relabel=no,seclabel0.label=foo,bar,baz,iotune.read_bytes_sec=1,iotune.read_iops_sec=2,iotune.write_bytes_sec=5,iotune.write_iops_sec=6
--disk /dev/default-pool/iso-vol,format=qcow2,startup_policy=optional,iotune.total_bytes_sec=10,iotune.total_iops_sec=20,
--disk /pool-dir/iso-vol,seclabel.model=dac,seclabel1.model=selinux,seclabel1.relabel=no,seclabel0.label=foo,bar,baz,iotune.read_bytes_sec=1,iotune.read_iops_sec=2,iotune.write_bytes_sec=5,iotune.write_iops_sec=6
--disk /pool-dir/iso-vol,format=qcow2,startup_policy=optional,iotune.total_bytes_sec=10,iotune.total_iops_sec=20,
--disk source_pool=rbd-ceph,source_volume=some-rbd-vol,size=.1,driver_type=raw,driver_name=qemu
--disk pool=rbd-ceph,size=.1,driver.name=qemu,driver.type=raw,driver.discard=unmap,driver.detect_zeroes=unmap,driver.io=native,driver.error_policy=stop
--disk source_protocol=http,source_host_name=example.com,source_host_port=8000,source_name=/path/to/my/file
@ -588,7 +588,7 @@ memorytune0.vcpus=0-3,memorytune0.node0.id=0,memorytune0.node0.bandwidth=60
--disk vol=gluster-pool/test-gluster.raw
--disk /var,device=floppy,snapshot=no,perms=rw
--disk %(NEWIMG2)s,size=1,backing_store=/tmp/foo.img,backing_format=vmdk,bus=usb,target.removable=yes
--disk /tmp/brand-new.img,size=1,backing_store=/dev/default-pool/iso-vol,boot.order=10,boot.loadparm=5
--disk /tmp/brand-new.img,size=1,backing_store=/pool-dir/iso-vol,boot.order=10,boot.loadparm=5
--disk path=/dev/pool-logical/diskvol7,device=lun,bus=scsi,reservations.managed=no,reservations.source.type=unix,reservations.source.path=/var/run/test/pr-helper0.sock,reservations.source.mode=client,\
source.reservations.managed=no,source.reservations.source.type=unix,source.reservations.source.path=/var/run/test/pr-helper0.sock,source.reservations.source.mode=client,target.rotation_rate=6000
--disk vol=iscsi-direct/unit:0:0:1
@ -873,7 +873,7 @@ c.add_compare("--connect " + utils.URIs.test_suite + " "
# Test various storage corner cases
c.add_compare(
"--disk path=%(EXISTIMG1)s " # Existing disk, no extra options
"--disk pool=default-pool,size=.0001 --disk pool=default-pool,size=.0001 " # Create 2 volumes in a pool
"--disk pool=pool-dir,size=.0001 --disk pool=pool-dir,size=.0001 " # Create 2 volumes in a pool
"--disk path=%(EXISTIMG1)s,bus=ide --disk path=%(EXISTIMG1)s,bus=ide --disk path=%(EXISTIMG1)s,bus=ide --disk path=%(EXISTIMG1)s,device=cdrom,bus=ide " # 3 IDE and CD
"--disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi " # > 16 scsi disks
"--disk path=%(NEWIMG1)s,format=raw,size=.0000001 " # Managed file using format raw
@ -881,7 +881,7 @@ c.add_compare(
"--disk /dev/zero " # Referencing a local unmanaged /dev node
"--disk pool=default,size=.00001 " # Building 'default' pool
"--disk /some/new/pool/dir/new,size=.1 " # autocreate the pool
"--disk /dev/default-pool/sharevol.img,perms=sh " # Colliding shareable storage
"--disk /pool-dir/sharevol.img,perms=sh " # Colliding shareable storage
"", "storage-creation")
@ -902,19 +902,19 @@ c.add_invalid("--file %(EXISTIMG1)s --file %(EXISTIMG1)s --file %(EXISTIMG1)s --
c.add_invalid("--disk device=disk", grep="requires a path") # --disk device=disk, but no path
c.add_invalid("--disk pool=pool-logical,size=1,format=qcow2", grep="Format attribute not supported") # format= invalid for disk pool
c.add_invalid("--disk pool=foopool,size=.0001", grep="no storage pool with matching name") # Specify a nonexistent pool
c.add_invalid("--disk vol=default-pool/foovol", grep="no storage vol with matching") # Specify a nonexistent volume
c.add_invalid("--disk vol=default-pool-no-slash", grep="Storage volume must be specified as vol=poolname/volname") # Wrong vol= format
c.add_invalid("--disk vol=pool-dir/foovol", grep="no storage vol with matching") # Specify a nonexistent volume
c.add_invalid("--disk vol=pool-dir-no-slash", grep="Storage volume must be specified as vol=poolname/volname") # Wrong vol= format
c.add_invalid("--disk perms=badformat", grep="Unknown 'perms' value") # Wrong perms= format
c.add_invalid("--disk size=badformat", grep="could not convert string") # Wrong size= format
c.add_invalid("--disk pool=default-pool", grep="Size must be specified for non existent") # Specify a pool with no size
c.add_invalid("--disk pool=pool-dir", grep="Size must be specified for non existent") # Specify a pool with no size
c.add_invalid("--disk path=/dev/foo/bar/baz,format=qcow2,size=.0000001", grep="Use libvirt APIs to manage the parent") # Unmanaged file using non-raw format
c.add_invalid("--disk path=/dev/pool-logical/newvol1.img,format=raw,size=.0000001", grep="Format attribute not supported for this volume type") # Managed disk using any format
c.add_invalid("--disk %(NEWIMG1)s", grep="Size must be specified") # Not specifying path= and non existent storage w/ no size
c.add_invalid("--disk %(NEWIMG1)s,sparse=true,size=100000000000", grep="The requested volume capacity will exceed") # Fail if fully allocated file would exceed disk space
c.add_invalid("--connect %(URI-TEST-FULL)s --disk %(COLLIDE)s --prompt", grep="already in use by other guests") # Colliding storage with --prompt should still fail
c.add_invalid("--connect %(URI-TEST-FULL)s --disk /dev/default-pool/backingl3.img", grep="already in use by other guests") # Colliding storage via backing store
c.add_invalid("--connect %(URI-TEST-FULL)s --disk /pool-dir/backingl3.img", grep="already in use by other guests") # Colliding storage via backing store
c.add_invalid("--connect %(URI-TEST-FULL)s --disk source_pool=rbd-ceph,source_volume=vol1", grep="already in use by other guests") # Collision with existing VM, via source pool/volume
c.add_invalid("--disk source.pool=default-pool,source.volume=idontexist", grep="no storage vol with matching name 'idontexist'") # trying to lookup non-existent volume, hit specific error code
c.add_invalid("--disk source.pool=pool-dir,source.volume=idontexist", grep="no storage vol with matching name 'idontexist'") # trying to lookup non-existent volume, hit specific error code
c.add_invalid("--disk size=1 --seclabel model=foo,type=bar", grep="not appear to have been successful") # Libvirt will error on the invalid security params, which should trigger the code path to clean up the disk images we created.
c.add_invalid("--disk size=1 --file foobar", grep="Cannot mix --file") # --disk and --file collision
@ -1483,8 +1483,8 @@ c.add_compare("--connect %(URI-KVM-X86)s " + _CLONE_NVRAM + " --auto-clone --nvr
c.add_compare("--connect %(URI-KVM-X86)s " + _CLONE_NVRAM_NEWPOOL + " --auto-clone", "nvram-newpool") # hits a particular nvram code path
c.add_compare("--connect %(URI-KVM-X86)s " + _CLONE_NVRAM_MISSING + " --auto-clone", "nvram-missing") # hits a particular nvram code path
c.add_compare("--connect %(URI-KVM-X86)s " + _CLONE_NVRAM_MISSING + " --auto-clone --preserve", "nvram-missing-preserve") # hits a particular nvram code path
c.add_compare("--connect %(URI-KVM-X86)s -o test-clone -n test-newclone --mac 12:34:56:1A:B2:C3 --mac 12:34:56:1A:B7:C3 --uuid 12345678-12F4-1234-1234-123456789AFA --file /dev/pool-logical/newclone1.img --file /dev/default-pool/newclone2.img --skip-copy=hdb --force-copy=sdb --file /dev/default-pool/newclone3.img", "clone-manual")
c.add_compare("--connect %(URI-KVM-X86)s -o test-clone -n test-newclone --mac 12:34:56:1A:B2:C3 --mac 12:34:56:1A:B7:C3 --uuid 12345678-12F4-1234-1234-123456789AFA --file /dev/pool-logical/newclone1.img --file /dev/default-pool/newclone2.img --skip-copy=hdb --force-copy=sdb --file /dev/default-pool/newclone3.img", "clone-manual")
c.add_compare("--connect %(URI-KVM-X86)s -o test-clone -n test-newclone --mac 12:34:56:1A:B2:C3 --mac 12:34:56:1A:B7:C3 --uuid 12345678-12F4-1234-1234-123456789AFA --file /dev/pool-logical/newclone1.img --file /pool-dir/newclone2.img --skip-copy=hdb --force-copy=sdb --file /pool-dir/newclone3.img", "clone-manual")
c.add_compare("--connect %(URI-KVM-X86)s -o test-clone -n test-newclone --mac 12:34:56:1A:B2:C3 --mac 12:34:56:1A:B7:C3 --uuid 12345678-12F4-1234-1234-123456789AFA --file /dev/pool-logical/newclone1.img --file /pool-dir/newclone2.img --skip-copy=hdb --force-copy=sdb --file /pool-dir/newclone3.img", "clone-manual")
c.add_compare(_CLONE_EMPTY + " --auto-clone --print-xml", "empty") # Auto flag, no storage
c.add_compare("--connect %(URI-KVM-X86)s -o test-clone-simple --auto -f /foo.img --print-xml", "cross-pool") # cross pool cloning which fails with test driver but let's confirm the XML
c.add_compare(_CLONE_MANAGED + " --auto-clone", "auto-managed") # Auto flag w/ managed storage
@ -1499,7 +1499,7 @@ c.add_invalid(_CLONE_EMPTY + " --file foo", grep="use '--name NEW_VM_NAME'") #
c.add_invalid(_CLONE_EMPTY + " --auto-clone -n test", grep="Invalid name for new guest") # new name raises error, already in use
c.add_invalid("-o test --auto-clone", grep="shutoff") # VM is running
c.add_invalid("--connect %(URI-TEST-FULL)s -o test-clone-simple -n newvm --file %(EXISTIMG1)s", grep="Clone onto existing storage volume is not currently supported") # Should complain about overwriting existing file
c.add_invalid("--connect %(URI-TEST-REMOTE)s -o test-clone-simple --auto-clone --file /dev/default-pool/testvol9.img --check all=off", grep="Clone onto existing storage volume") # hit a specific error message
c.add_invalid("--connect %(URI-TEST-REMOTE)s -o test-clone-simple --auto-clone --file /pool-dir/testvol9.img --check all=off", grep="Clone onto existing storage volume") # hit a specific error message
c.add_invalid("--connect %(URI-TEST-FULL)s -o test-clone-full --auto-clone", grep="not enough free space") # catch failure of clone path setting
c.add_invalid(_CLONE_NET_HTTP + " --auto-clone", grep="'http' is not cloneable")
c.add_invalid(_CLONE_NET_RBD + " --connect %(URI-TEST-FULL)s --auto-clone", grep="Cloning rbd volumes is not yet supported")

8
tests/test_disk.py
View File

@ -109,7 +109,7 @@ def test_disk_path_in_use_kernel():
# Comparing against kernel
vms = virtinst.DeviceDisk.path_in_use_by(
conn, "/dev/default-pool/test-arm-kernel")
conn, "/pool-dir/test-arm-kernel")
assert vms == ["test-arm-kernel"]
@ -117,7 +117,7 @@ def test_disk_diskbackend_misc():
# Test get_size() with vol_install
conn = utils.URIs.open_testdefault_cached()
disk = virtinst.DeviceDisk(conn)
pool = conn.storagePoolLookupByName("default-pool")
pool = conn.storagePoolLookupByName("pool-dir")
vol_install = disk.build_vol_install(conn, "newvol1.img", pool, 1, False)
disk.set_vol_install(vol_install)
assert disk.get_size() == 1.0
@ -156,7 +156,7 @@ def test_disk_diskbackend_misc():
assert newdisk.get_size() == 0
conn = utils.URIs.open_testdriver_cached()
volpath = "/dev/default-pool/test-clone-simple.img"
volpath = "/pool-dir/test-clone-simple.img"
assert virtinst.DeviceDisk.path_definitely_exists(conn, volpath)
disk = virtinst.DeviceDisk(conn)
disk.set_source_path(volpath)
@ -196,7 +196,7 @@ def test_disk_diskbackend_parse():
# Ensure set_backend_for_existing_path resolves a path
# to its existing storage volume
xml = ("<disk type='file' device='disk'>"
"<source file='/dev/default-pool/default-vol'/>"
"<source file='/pool-dir/default-vol'/>"
"</disk>")
disk = virtinst.DeviceDisk(conn, parsexml=xml)
disk.set_backend_for_existing_path()

2
tests/test_storage.py
View File

@ -103,7 +103,7 @@ def createVol(conn, poolobj, volname=None, input_vol=None, clone_vol=None):
def testDirPool():
conn = utils.URIs.open_testdefault_cached()
poolobj = createPool(conn,
StoragePool.TYPE_DIR, "pool-dir")
StoragePool.TYPE_DIR, "pool-dir2")
invol = createVol(conn, poolobj)
createVol(conn, poolobj,
volname=invol.name() + "input", input_vol=invol)

10
tests/test_xmlparse.py
View File

@ -324,7 +324,7 @@ def testAlterDisk():
disk = _get_disk("fda")
check = _make_checker(disk)
disk.set_source_path("/dev/default-pool/default-vol")
disk.set_source_path("/pool-dir/default-vol")
disk.sync_path_props()
check("startup_policy", None, "optional")
check("shareable", False, True)
@ -618,12 +618,12 @@ def testChangeKVMMedia():
guest, outfile = _get_test_content(kvmconn, "change-media")
disk = guest.devices.disk[0]
disk.set_source_path("/dev/default-pool/default-vol")
disk.set_source_path("/pool-dir/default-vol")
disk.sync_path_props()
disk = guest.devices.disk[1]
disk.set_source_path("/dev/default-pool/default-vol")
assert disk.get_source_path() == "/dev/default-pool/default-vol"
disk.set_source_path("/pool-dir/default-vol")
assert disk.get_source_path() == "/pool-dir/default-vol"
disk.set_source_path("/dev/pool-logical/diskvol1")
disk.sync_path_props()
@ -632,7 +632,7 @@ def testChangeKVMMedia():
disk.sync_path_props()
disk = guest.devices.disk[3]
disk.set_source_path("/dev/default-pool/default-vol")
disk.set_source_path("/pool-dir/default-vol")
disk.sync_path_props()
disk = guest.devices.disk[4]

8
tests/uitests/test_addhardware.py
View File

@ -176,7 +176,7 @@ def testAddDisks(app):
browse = app.root.find("vmm-storage-browser")
# Create a vol, refresh, then delete it
browse.find_fuzzy("default-pool", "table cell").click()
browse.find_fuzzy("pool-dir", "table cell").click()
browse.find("vol-new", "push button").click()
newvol = app.find_window("Add a Storage Volume")
newname = "a-newvol"
@ -229,7 +229,7 @@ def testAddDisks(app):
tab.combo_select("Device type:", "Floppy device")
diskradio = tab.find_fuzzy("Create a disk image", "radio")
lib.utils.check(lambda: not diskradio.sensitive)
tab.find("storage-entry").set_text("/dev/default-pool/bochs-vol")
tab.find("storage-entry").set_text("/pool-dir/bochs-vol")
_finish(addhw, check=details)
# empty cdrom
@ -532,7 +532,7 @@ def testAddLXCFilesystem(app):
tab.find("Browse...", "push button").click()
# Specific testing for dir vol handling for filesystem browse
browsewin = app.root.find("vmm-storage-browser")
browsewin.find_fuzzy("default-pool", "table cell").click()
browsewin.find_fuzzy("pool-dir", "table cell").click()
browsewin.find_fuzzy("bochs-vol", "table cell").click()
choose = browsewin.find("Choose Volume")
lib.utils.check(lambda: not choose.sensitive)
@ -541,7 +541,7 @@ def testAddLXCFilesystem(app):
choose.click()
lib.utils.check(lambda: addhw.active)
lib.utils.check(
lambda: source.text == "/dev/default-pool/dir-vol")
lambda: source.text == "/pool-dir/dir-vol")
tab.find_fuzzy("Export filesystem", "check").click()
# Use this to test some error.py logic for truncating large errors

4
tests/uitests/test_clonevm.py
View File

@ -148,7 +148,7 @@ def testCloneStorageChange(app):
pathtxt = stgwin.find(None, "text", "New Path:")
lib.utils.check(lambda: newname in pathtxt.text)
stgwin.find("Browse", "push button").click()
app.select_storagebrowser_volume("default-pool", "iso-vol")
app.select_storagebrowser_volume("pool-dir", "iso-vol")
lib.utils.check(lambda: "iso-vol" in pathtxt.text)
stgwin.find("OK").click()
app.click_alert_button("overwrite the existing", "No")
@ -224,7 +224,7 @@ def testCloneNonmanaged(app):
win.find("IDE Disk 1", "table cell").click()
win.find("XML", "page tab").click()
xmleditor = win.find("XML editor")
origpath = "/dev/default-pool/test-clone-simple.img"
origpath = "/pool-dir/test-clone-simple.img"
newpath = tmpsrc.name
xmleditor.set_text(xmleditor.text.replace(origpath, newpath))
win.find("config-apply").click()

32
tests/uitests/test_createvm.py
View File

@ -105,7 +105,7 @@ def testNewVMMultiConnection(app):
entry.click()
# Launch this so we can verify storage browser is reset too
newvm.find_fuzzy("install-iso-browse", "button").click()
app.select_storagebrowser_volume("default-pool", "iso-vol")
app.select_storagebrowser_volume("pool-dir", "iso-vol")
newvm.find_fuzzy("Automatically detect", "check").click()
newvm.find("oslist-entry").set_text("generic")
newvm.find("oslist-popover").find_fuzzy("generic").click()
@ -255,7 +255,7 @@ def testNewVMCDROMRegular(app):
# Select a fake iso
newvm.find_fuzzy("install-iso-browse", "button").click()
app.select_storagebrowser_volume("default-pool", "iso-vol")
app.select_storagebrowser_volume("pool-dir", "iso-vol")
osentry = newvm.find("oslist-entry")
lib.utils.check(lambda: osentry.text == "None detected")
@ -456,7 +456,7 @@ def testNewKVMQ35Tweaks(app):
newvm.find_fuzzy("Import", "radio").click()
_forward(newvm)
newvm.find("import-entry").set_text("/dev/default-pool/testvol1.img")
newvm.find("import-entry").set_text("/pool-dir/testvol1.img")
newvm.find("oslist-entry").set_text("fribfrob")
popover = newvm.find("oslist-popover")
popover.find_fuzzy("linux2020").click()
@ -527,7 +527,7 @@ def testNewKVMQ35UEFI(app):
newvm.find_fuzzy("Import", "radio").click()
_forward(newvm)
newvm.find("import-entry").set_text("/dev/default-pool/testvol1.img")
newvm.find("import-entry").set_text("/pool-dir/testvol1.img")
newvm.find("oslist-entry").set_text("fedora30")
popover = newvm.find("oslist-popover")
popover.find("include-eol").click()
@ -630,7 +630,7 @@ def testNewVMAArch64UEFI(app):
newvm.find_fuzzy("Automatically detect", "check").click()
newvm.find("oslist-entry").set_text("generic")
newvm.find("oslist-popover").find_fuzzy("generic").click()
newvm.find("media-entry").set_text("/dev/default-pool/testvol1.img")
newvm.find("media-entry").set_text("/pool-dir/testvol1.img")
_forward(newvm)
_forward(newvm)
# Disable storage, this triggers a livecd code path in createvm.py
@ -669,7 +669,7 @@ def testNewVMArmKernel(app):
lib.utils.check(lambda: importradio.checked)
_forward(newvm)
newvm.find("import-entry").set_text("/dev/default-pool/default-vol")
newvm.find("import-entry").set_text("/pool-dir/default-vol")
# Make sure the info box shows up
newvm.find("Kernel/initrd settings can be configured")
newvm.find("oslist-entry").set_text("generic")
@ -703,7 +703,7 @@ def testNewVMContainerApp(app):
_forward(newvm, check=False)
app.click_alert_button("path is required", "OK")
newvm.find("install-app-browse").click()
app.select_storagebrowser_volume("default-pool", "aaa-unused.qcow2")
app.select_storagebrowser_volume("pool-dir", "aaa-unused.qcow2")
lib.utils.check(lambda: "aaa-unused.qcow2" in apptext.text)
_forward(newvm)
@ -845,7 +845,7 @@ def testNewVMContainerTree(app):
app.click_alert_button("path is required", "OK")
newvm.find("install-oscontainer-browse").click()
app.select_storagebrowser_volume("default-pool", "dir-vol")
app.select_storagebrowser_volume("pool-dir", "dir-vol")
lib.utils.check(lambda: "dir-vol" in dirtext.text)
_forward(newvm)
@ -955,7 +955,7 @@ def testNewVMXenPV(app):
newvm.find_fuzzy("Import", "radio").click()
_forward(newvm)
newvm.find("import-entry").set_text("/dev/default-pool/testvol1.img")
newvm.find("import-entry").set_text("/pool-dir/testvol1.img")
newvm.find("oslist-entry").set_text("generic")
newvm.find("oslist-popover").find_fuzzy("generic").click()
_forward(newvm)
@ -1001,7 +1001,7 @@ def testNewVMInstallFail(app):
_back(newvm)
newvm.find_fuzzy("Select or create", "radio").click()
newvm.find("storage-entry").set_text("/dev/default-pool/somenewvol1")
newvm.find("storage-entry").set_text("/pool-dir/somenewvol1")
_forward(newvm)
newvm.find_fuzzy("Name", "text").set_text("test-foo")
newvm.find_fuzzy("Finish", "button").click()
@ -1023,7 +1023,7 @@ def testNewVMCustomizeXMLEdit(app):
newvm.find_fuzzy("Local install media", "radio").click()
newvm.find_fuzzy("Forward", "button").click()
nonexistpath = "/dev/foovmm-idontexist"
existpath = "/dev/default-pool/testvol1.img"
existpath = "/pool-dir/testvol1.img"
newvm.find("media-entry").set_text(nonexistpath)
lib.utils.check(
lambda: newvm.find("oslist-entry").text == "None detected")
@ -1134,10 +1134,10 @@ def testNewVMRemote(app):
app.click_alert_button("import is required", "OK")
# Click forward, but Import path doesn't exist
importtext.set_text("/dev/default-pool/idontexist")
importtext.set_text("/pool-dir/idontexist")
_forward(newvm, check=False)
app.click_alert_button("import path must point", "OK")
importtext.set_text("/dev/default-pool/default-vol")
importtext.set_text("/pool-dir/default-vol")
# Click forward, hitting missing OS error
_forward(newvm, check=False)
@ -1162,9 +1162,9 @@ def testNewVMRemote(app):
lib.utils.check(lambda: not browsewin.active)
# Reopen, select storage
newvm.find("install-import-browse").click()
app.select_storagebrowser_volume("default-pool", "bochs-vol")
app.select_storagebrowser_volume("pool-dir", "bochs-vol")
lib.utils.check(
lambda: importtext.text == "/dev/default-pool/bochs-vol")
lambda: importtext.text == "/pool-dir/bochs-vol")
_forward(newvm)
_forward(newvm)
@ -1183,7 +1183,7 @@ def testNewVMSession(app):
newvm.find_fuzzy("Import", "radio").click()
_forward(newvm)
newvm.find("import-entry").set_text("/dev/default-pool/testvol1.img")
newvm.find("import-entry").set_text("/pool-dir/testvol1.img")
newvm.find("oslist-entry").set_text("generic")
newvm.find("oslist-popover").find_fuzzy("generic").click()
_forward(newvm)

8
tests/uitests/test_createvol.py
View File

@ -20,7 +20,7 @@ def testCreateVolDefault(app):
Create default volume, clean it up
"""
hostwin = app.manager_open_host("Storage")
poolcell = hostwin.find("default-pool", "table cell")
poolcell = hostwin.find("pool-dir", "table cell")
poolcell.click()
vollist = hostwin.find("vol-list", "table")
win = _open_createvol(app, hostwin)
@ -56,7 +56,7 @@ def testCreateVolMisc(app):
Cover all createvol options
"""
hostwin = app.manager_open_host("Storage")
poolcell = hostwin.find("default-pool", "table cell")
poolcell = hostwin.find("pool-dir", "table cell")
poolcell.click()
win = _open_createvol(app, hostwin)
name = win.find("Name:", "text")
@ -81,7 +81,7 @@ def testCreateVolMisc(app):
"Locate existing storage", "file chooser")
chooser.window_close()
app.select_storagebrowser_volume(
"default-pool", "bochs-vol", doubleclick=True)
"pool-dir", "bochs-vol", doubleclick=True)
backingstore = win.find("backing-store")
lib.utils.check(lambda: "bochs-vol" in backingstore.text)
finish.click()
@ -119,7 +119,7 @@ def testCreateVolMisc(app):
def testCreateVolXMLEditor(app):
app.open(xmleditor_enabled=True)
hostwin = app.manager_open_host("Storage")
poolcell = hostwin.find("default-pool", "table cell")
poolcell = hostwin.find("pool-dir", "table cell")
poolcell.click()
win = _open_createvol(app, hostwin)
finish = win.find("Finish", "push button")

18
tests/uitests/test_delete.py
View File

@ -97,8 +97,8 @@ def _testDeleteManyDevices(app,
undeletable_rows = [r.path for r in rows if r.undeletable]
notdefault_rows = [r.path for r in rows if r.notdefault]
defpath = "/dev/default-pool/overlay.img"
nondefault_path2 = "/dev/default-pool/sharevol.img"
defpath = "/pool-dir/overlay.img"
nondefault_path2 = "/pool-dir/sharevol.img"
assert selected_rows == [defpath]
if nondefault_path:
@ -130,7 +130,7 @@ def _testDeleteManyDevices(app,
# Confirm
browser = _open_storage_browser(app)
browser.find_fuzzy("default-pool", "table cell").click()
browser.find_fuzzy("pool-dir", "table cell").click()
browser.find("vol-refresh", "push button").click()
lib.utils.check(lambda: "overlay.img" not in browser.fmt_nodes())
browser.find("sharevol.img", "table cell")
@ -205,7 +205,7 @@ def testDeleteSkipStorage(app):
# Confirm nothing was deleted compare to the default selections
browser = _open_storage_browser(app)
browser.find_fuzzy("default-pool", "table cell").click()
browser.find_fuzzy("pool-dir", "table cell").click()
browser.find("vol-refresh", "push button").click()
browser.find("overlay.img", "table cell")
browser.find("sharevol.img", "table cell")
@ -235,7 +235,7 @@ def testDeleteDeviceNoStorage(app):
details.window_close()
browser = _open_storage_browser(app)
browser.find_fuzzy("default-pool", "table cell").click()
browser.find_fuzzy("pool-dir", "table cell").click()
browser.find("vol-refresh", "push button").click()
browser.find("overlay.img", "table cell")
@ -261,13 +261,13 @@ def testDeleteDeviceWithStorage(app):
lib.utils.check(lambda: not chk.checked)
chk.click()
lib.utils.check(lambda: chk.checked)
path = "/dev/default-pool/overlay.img"
path = "/pool-dir/overlay.img"
delete.find_fuzzy(path)
_finish(app, delete, [path])
details.window_close()
browser = _open_storage_browser(app)
browser.find_fuzzy("default-pool", "table cell").click()
browser.find_fuzzy("pool-dir", "table cell").click()
browser.find("vol-refresh", "push button").click()
lib.utils.check(lambda: "overlay.img" not in browser.fmt_nodes())
@ -292,7 +292,7 @@ def testDeleteDeviceFail(app):
lib.utils.check(lambda: not chk.checked)
chk.click()
lib.utils.check(lambda: chk.checked)
path = "/dev/default-pool/overlay.img"
path = "/pool-dir/overlay.img"
delete.find_fuzzy(path)
_finish(app, delete, [path], expect_fail=True)
app.click_alert_button("Storage will not be.*deleted", "OK")
@ -300,6 +300,6 @@ def testDeleteDeviceFail(app):
# Verify file still exists
browser = _open_storage_browser(app)
browser.find_fuzzy("default-pool", "table cell").click()
browser.find_fuzzy("pool-dir", "table cell").click()
browser.find("vol-refresh", "push button").click()
browser.find("overlay.img", "table cell")

8
tests/uitests/test_details.py
View File

@ -331,7 +331,7 @@ def testDetailsEditDomain2(app):
initrd = tab.find("Initrd path:", "text")
tab.find("initrd-browse", "push button").click()
app.select_storagebrowser_volume("default-pool", "backingl1.img")
app.select_storagebrowser_volume("pool-dir", "backingl1.img")
lib.utils.check(lambda: win.active)
lib.utils.check(lambda: "backing" in initrd.text)
appl.click()
@ -339,14 +339,14 @@ def testDetailsEditDomain2(app):
lib.utils.check(lambda: win.active)
tab.find("kernel-browse", "push button").click()
app.select_storagebrowser_volume("default-pool", "bochs-vol")
app.select_storagebrowser_volume("pool-dir", "bochs-vol")
lib.utils.check(lambda: win.active)
kernelpath = tab.find("Kernel path:", "text")
lib.utils.check(lambda: "bochs" in kernelpath.text)
dtb = tab.find("DTB path:", "text")
tab.find("dtb-browse", "push button").click()
app.select_storagebrowser_volume("default-pool", "iso-vol")
app.select_storagebrowser_volume("pool-dir", "iso-vol")
lib.utils.check(lambda: win.active)
lib.utils.check(lambda: "iso-vol" in dtb.text)
@ -779,7 +779,7 @@ def testDetailsXMLEdit(app):
# Make some disk edits
tab = _select_hw(app, win, "IDE Disk 1", "disk-tab")
win.find("XML", "page tab").click()
origpath = "/dev/default-pool/test-clone-simple.img"
origpath = "/pool-dir/test-clone-simple.img"
newpath = "/path/FOOBAR"
xmleditor.set_text(xmleditor.text.replace(origpath, newpath))
finish.click()

8
tests/uitests/test_host.py
View File

@ -85,14 +85,14 @@ def testHostStorageEdit(app):
finish = win.find("Apply", "push button")
# Shut off a pool, do an XML edit, verify it
win.find("default-pool", "table cell").click()
win.find("pool-dir", "table cell").click()
delete = win.find("pool-delete", "push button")
stop = win.find("pool-stop", "push button")
stop.click()
lib.utils.check(lambda: delete.sensitive)
win.find("XML", "page tab").click()
xmleditor = win.find("XML editor")
origpath = "/dev/default-pool"
origpath = "/pool-dir"
newpath = "/dev/foo/bar/baz"
xmleditor.set_text(xmleditor.text.replace(origpath, newpath))
finish.click()
@ -120,7 +120,7 @@ def testHostStorageVolMisc(app):
Misc actions involving volumes
"""
win = app.manager_open_host("Storage").find("storage-grid")
win.find_fuzzy("default-pool", "table cell").click()
win.find_fuzzy("pool-dir", "table cell").click()
vollist = win.find("vol-list", "table")
vol1 = vollist.find("backingl1.img", "table cell")
@ -136,7 +136,7 @@ def testHostStorageVolMisc(app):
app.root.find("Copy Volume Path", "menu item").click()
from gi.repository import Gdk, Gtk
clipboard = Gtk.Clipboard.get_default(Gdk.Display.get_default())
lib.utils.check(lambda: clipboard.wait_for_text() == "/dev/default-pool/UPPER")
lib.utils.check(lambda: clipboard.wait_for_text() == "/pool-dir/UPPER")
def testHostConn(app):

4
tests/uitests/test_mediachange.py
View File

@ -52,7 +52,7 @@ def testMediaChange(app):
entry.click()
# Use the storage browser to select new floppy storage
tab.find("Browse", "push button").click()
app.select_storagebrowser_volume("default-pool", "iso-vol")
app.select_storagebrowser_volume("pool-dir", "iso-vol")
appl.click()
# Browse for image
@ -61,7 +61,7 @@ def testMediaChange(app):
combo.find(r"Fedora12_media \(/dev/sr0\)")
entry.click()
tab.find("Browse", "push button").click()
app.select_storagebrowser_volume("default-pool", "backingl1.img")
app.select_storagebrowser_volume("pool-dir", "backingl1.img")
# Check 'already in use' dialog
appl.click()
app.click_alert_button("already in use by", "No")