From bcfe00ded37e8dbd381554dfc9121ca4c25b796a Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon, 30 Sep 2013 14:11:49 +0200
Subject: [RHEL-7.0 virt-manager PATCH] tests: move the storage pool under
/dev.
The commit efab27afbf02743a3a2582e9a111eb1b7d985b26 in libvirt uses
/dev/%s for logical pools, change the tests to accommodate it.
(crobinso: additional fix to work with older libvirt)
(cherry-picked from commit 4f63458050d2c343ffceb6bd8d2af64857e4ad5c)
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
tests/cli-test-xml/clone-disk-managed.xml | 2 +-
tests/cli-test-xml/compare/clone-auto1.xml | 13 ++++++------
tests/cli-test-xml/compare/clone-auto2.xml | 2 +-
tests/cli-test-xml/compare/image-boot0.xml | 4 ++--
tests/cli-test-xml/compare/image-boot1.xml | 4 ++--
tests/cli-test-xml/compare/kvm-f14-url.xml | 11 +++++++----
tests/cli-test-xml/compare/kvm-win2k3-cdrom.xml | 18 +++++++++++------
tests/cli-test-xml/compare/kvm-xenner.xml | 7 +++++--
tests/cli-test-xml/compare/many-devices.xml | 4 ++--
tests/cli-test-xml/compare/qemu-plain.xml | 7 +++++--
tests/cli-test-xml/compare/xen-default.xml | 4 ++--
tests/cli-test-xml/compare/xen-hvm.xml | 4 ++--
tests/cli-test-xml/compare/xen-ia64-default.xml | 4 ++--
tests/cli-test-xml/compare/xen-ia64-hvm.xml | 8 ++++----
tests/cli-test-xml/compare/xen-ia64-pv.xml | 8 ++++----
tests/cli-test-xml/compare/xen-pv.xml | 8 ++++----
tests/clitest.py | 18 ++++++++---------
tests/clone-xml/cross-pool-in.xml | 4 ++--
tests/clone-xml/cross-pool-out.xml | 4 ++--
tests/clone-xml/managed-storage-in.xml | 4 ++--
tests/clone-xml/managed-storage-out.xml | 4 ++--
tests/clonetest.py | 16 +++++++--------
tests/storage-xml/pool-dir-volclone.xml | 4 ++--
tests/storage-xml/pool-dir.xml | 2 +-
tests/storage-xml/pool-disk-volclone.xml | 4 ++--
tests/storage-xml/pool-disk.xml | 2 +-
tests/storage-xml/pool-fs-volclone.xml | 4 ++--
tests/storage-xml/pool-fs.xml | 2 +-
tests/storage-xml/pool-iscsi-iqn.xml | 2 +-
tests/storage-xml/pool-iscsi.xml | 2 +-
tests/storage-xml/pool-logical-manydev.xml | 2 +-
tests/storage-xml/pool-logical-srcname.xml | 2 +-
tests/storage-xml/pool-logical-volclone.xml | 4 ++--
tests/storage-xml/pool-logical.xml | 2 +-
tests/storage-xml/pool-mpath.xml | 2 +-
tests/storage-xml/pool-netfs-volclone.xml | 4 ++--
tests/storage-xml/pool-netfs.xml | 2 +-
tests/storage-xml/pool-scsi.xml | 2 +-
tests/storage.py | 2 +-
tests/testdriver.xml | 23 +++++++++++-----------
tests/utils.py | 4 ++--
tests/validation.py | 4 ++--
tests/xmlconfig-xml/boot-many-devices.xml | 2 +-
tests/xmlconfig-xml/install-f11-ac97.xml | 2 +-
tests/xmlconfig-xml/install-f11-noac97.xml | 2 +-
tests/xmlconfig-xml/install-f11-qemu.xml | 2 +-
tests/xmlconfig-xml/install-f11-xen.xml | 2 +-
tests/xmlconfig-xml/install-f11.xml | 2 +-
tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml | 2 +-
tests/xmlconfig-xml/misc-qemu-iso-disk.xml | 2 +-
tests/xmlconfig-xml/rhel6-kvm-stage1.xml | 4 ++--
tests/xmlconfig-xml/rhel6-kvm-stage2.xml | 4 ++--
tests/xmlconfig-xml/winxp-kvm-stage1.xml | 2 +-
tests/xmlconfig-xml/winxp-kvm-stage2.xml | 2 +-
tests/xmlconfig-xml/winxp-kvm-stage3.xml | 2 +-
tests/xmlconfig.py | 18 ++++++++---------
tests/xmlparse-xml/add-devices-in.xml | 2 +-
tests/xmlparse-xml/add-devices-out.xml | 2 +-
tests/xmlparse-xml/change-disk-out.xml | 2 +-
tests/xmlparse-xml/change-guest-in.xml | 2 +-
tests/xmlparse-xml/change-guest-out.xml | 2 +-
tests/xmlparse-xml/change-media-out.xml | 10 +++++-----
tests/xmlparse-xml/change-smartcard-in.xml | 2 +-
tests/xmlparse-xml/change-smartcard-out.xml | 2 +-
tests/xmlparse.py | 14 ++++++-------
virtinst/Guest.py | 4 ++--
66 files changed, 170 insertions(+), 153 deletions(-)
diff --git a/tests/cli-test-xml/clone-disk-managed.xml b/tests/cli-test-xml/clone-disk-managed.xml
index 2018111..8fe1fe2 100644
--- a/tests/cli-test-xml/clone-disk-managed.xml
+++ b/tests/cli-test-xml/clone-disk-managed.xml
@@ -15,7 +15,7 @@
<devices>
<disk type='file' device='disk'>
<target dev='hda' bus='ide'/>
- <source file='/default-pool/default-vol'/>
+ <source file='/dev/default-pool/default-vol'/>
</disk>
<disk type='file' device='floppy'>
<target dev='fda' bus='fdc'/>
diff --git a/tests/cli-test-xml/compare/clone-auto1.xml b/tests/cli-test-xml/compare/clone-auto1.xml
index a423066..08c0e37 100644
--- a/tests/cli-test-xml/compare/clone-auto1.xml
+++ b/tests/cli-test-xml/compare/clone-auto1.xml
@@ -20,13 +20,13 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy">
- <source dev="/disk-pool/diskvol1-clone"/>
+ <driver type="vmdk" name="qemu"/>
+ <source dev="/dev/disk-pool/diskvol1-clone"/>
<target dev="fda" bus="fdc"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
- <driver name="qemu" type="raw"/>
</disk>
<disk type="block" device="disk">
- <source dev="/disk-pool/diskvol2"/>
+ <source dev="/dev/disk-pool/diskvol2"/>
<target dev="sda" bus="scsi"/>
<readonly/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
@@ -37,7 +37,8 @@
<address type="drive" controller="0" bus="0" target="0" unit="1"/>
</disk>
<disk type="block" device="disk">
- <source dev="/default-pool/collidevol1.img"/>
+ <driver type="qcow2"/>
+ <source dev="/dev/default-pool/collidevol1.img"/>
<target dev="sdc" bus="scsi"/>
<readonly/>
<shareable/>
@@ -47,13 +48,13 @@
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
<driver name="qemu" type="raw"/>
- <source file="/default-pool/default-vol-clone"/>
+ <source file="/dev/default-pool/default-vol-clone"/>
</disk>
<disk type="file" device="disk">
<target dev="hdb" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="1"/>
<driver name="qemu" type="raw"/>
- <source file="/default-pool/testvol2-clone.img"/>
+ <source file="/dev/default-pool/testvol2-clone.img"/>
</disk>
<controller type="scsi" index="0"/>
<controller type="fdc" index="0"/>
diff --git a/tests/cli-test-xml/compare/clone-auto2.xml b/tests/cli-test-xml/compare/clone-auto2.xml
index e6cb868..f5863fd 100644
--- a/tests/cli-test-xml/compare/clone-auto2.xml
+++ b/tests/cli-test-xml/compare/clone-auto2.xml
@@ -22,7 +22,7 @@
<disk type="file" device="disk">
<target dev="hda" bus="ide"/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>
- <source file="/default-pool/newvm.img"/>
+ <source file="/dev/default-pool/newvm.img"/>
</disk>
<controller type="ide" index="0"/>
<interface type="user">
diff --git a/tests/cli-test-xml/compare/image-boot0.xml b/tests/cli-test-xml/compare/image-boot0.xml
index ac4ce01..b93ce9f 100644
--- a/tests/cli-test-xml/compare/image-boot0.xml
+++ b/tests/cli-test-xml/compare/image-boot0.xml
@@ -24,9 +24,9 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='xen'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<video>
- <model type='vga'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/image-boot1.xml b/tests/cli-test-xml/compare/image-boot1.xml
index 16db2a8..c336086 100644
--- a/tests/cli-test-xml/compare/image-boot1.xml
+++ b/tests/cli-test-xml/compare/image-boot1.xml
@@ -26,10 +26,10 @@
<model type='e1000'/>
</interface>
<input type='mouse' bus='ps2'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<console type='pty'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/kvm-f14-url.xml b/tests/cli-test-xml/compare/kvm-f14-url.xml
index 84bc59c..e16bf46 100644
--- a/tests/cli-test-xml/compare/kvm-f14-url.xml
+++ b/tests/cli-test-xml/compare/kvm-f14-url.xml
@@ -47,10 +47,10 @@
<model type='virtio'/>
</interface>
<input type='tablet' bus='usb'/>
- <graphics type='vnc' port='-1'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
<console type='pty'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
@@ -101,10 +101,13 @@
<model type='virtio'/>
</interface>
<input type='tablet' bus='usb'/>
- <graphics type='vnc' port='-1'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
<console type='pty'/>
+ <channel type='spicevmc'>
+ <target type='virtio' name='com.redhat.spice.0'/>
+ </channel>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/kvm-win2k3-cdrom.xml b/tests/cli-test-xml/compare/kvm-win2k3-cdrom.xml
index 75b9b0c..b5079ad 100644
--- a/tests/cli-test-xml/compare/kvm-win2k3-cdrom.xml
+++ b/tests/cli-test-xml/compare/kvm-win2k3-cdrom.xml
@@ -34,11 +34,11 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='tablet' bus='usb'/>
- <graphics type='vnc' port='-1'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
<console type='pty'/>
<sound model='ich6'/>
<video>
- <model type='vga'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
@@ -77,11 +77,14 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='tablet' bus='usb'/>
- <graphics type='vnc' port='-1'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
<console type='pty'/>
+ <channel type='spicevmc'>
+ <target type='virtio' name='com.redhat.spice.0'/>
+ </channel>
<sound model='ich6'/>
<video>
- <model type='vga'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
@@ -120,11 +123,14 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='tablet' bus='usb'/>
- <graphics type='vnc' port='-1'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
<console type='pty'/>
+ <channel type='spicevmc'>
+ <target type='virtio' name='com.redhat.spice.0'/>
+ </channel>
<sound model='ich6'/>
<video>
- <model type='vga'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/kvm-xenner.xml b/tests/cli-test-xml/compare/kvm-xenner.xml
index 7d2f6f7..1f3e5e4 100644
--- a/tests/cli-test-xml/compare/kvm-xenner.xml
+++ b/tests/cli-test-xml/compare/kvm-xenner.xml
@@ -17,9 +17,12 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='xen'/>
- <graphics type='vnc' port='-1'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
+ <channel type='spicevmc'>
+ <target type='virtio' name='com.redhat.spice.0'/>
+ </channel>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/many-devices.xml b/tests/cli-test-xml/compare/many-devices.xml
index 6c59653..8773919 100644
--- a/tests/cli-test-xml/compare/many-devices.xml
+++ b/tests/cli-test-xml/compare/many-devices.xml
@@ -24,7 +24,7 @@
<emulator>/usr/bin/test-hv</emulator>
<disk type='file' device='disk'>
<driver cache='writeback' io='threads'/>
- <source file='/default-pool/UPPER'/>
+ <source file='/dev/default-pool/UPPER'/>
<target dev='hda' bus='ide'/>
<shareable/>
<serial>WD-WMAP9A966149</serial>
@@ -106,7 +106,7 @@
<emulator>/usr/bin/test-hv</emulator>
<disk type='file' device='disk'>
<driver cache='writeback' io='threads'/>
- <source file='/default-pool/UPPER'/>
+ <source file='/dev/default-pool/UPPER'/>
<target dev='hda' bus='ide'/>
<shareable/>
<serial>WD-WMAP9A966149</serial>
diff --git a/tests/cli-test-xml/compare/qemu-plain.xml b/tests/cli-test-xml/compare/qemu-plain.xml
index adf71e2..7139829 100644
--- a/tests/cli-test-xml/compare/qemu-plain.xml
+++ b/tests/cli-test-xml/compare/qemu-plain.xml
@@ -25,10 +25,13 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='tablet' bus='usb'/>
- <graphics type='vnc' port='-1'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
<console type='pty'/>
+ <channel type='spicevmc'>
+ <target type='virtio' name='com.redhat.spice.0'/>
+ </channel>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/xen-default.xml b/tests/cli-test-xml/compare/xen-default.xml
index 3465522..cfb52a3 100644
--- a/tests/cli-test-xml/compare/xen-default.xml
+++ b/tests/cli-test-xml/compare/xen-default.xml
@@ -20,9 +20,9 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='xen'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/xen-hvm.xml b/tests/cli-test-xml/compare/xen-hvm.xml
index b7a7821..5534184 100644
--- a/tests/cli-test-xml/compare/xen-hvm.xml
+++ b/tests/cli-test-xml/compare/xen-hvm.xml
@@ -32,10 +32,10 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='ps2'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<console type='pty'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/xen-ia64-default.xml b/tests/cli-test-xml/compare/xen-ia64-default.xml
index 3465522..cfb52a3 100644
--- a/tests/cli-test-xml/compare/xen-ia64-default.xml
+++ b/tests/cli-test-xml/compare/xen-ia64-default.xml
@@ -20,9 +20,9 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='xen'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/xen-ia64-hvm.xml b/tests/cli-test-xml/compare/xen-ia64-hvm.xml
index 05b7af2..6dea930 100644
--- a/tests/cli-test-xml/compare/xen-ia64-hvm.xml
+++ b/tests/cli-test-xml/compare/xen-ia64-hvm.xml
@@ -28,10 +28,10 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='ps2'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<console type='pty'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
@@ -63,10 +63,10 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='ps2'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<console type='pty'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/xen-ia64-pv.xml b/tests/cli-test-xml/compare/xen-ia64-pv.xml
index a3f7759..c26ffd9 100644
--- a/tests/cli-test-xml/compare/xen-ia64-pv.xml
+++ b/tests/cli-test-xml/compare/xen-ia64-pv.xml
@@ -25,9 +25,9 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='xen'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
@@ -53,9 +53,9 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='xen'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/xen-pv.xml b/tests/cli-test-xml/compare/xen-pv.xml
index cf3f2dc..64c8adb 100644
--- a/tests/cli-test-xml/compare/xen-pv.xml
+++ b/tests/cli-test-xml/compare/xen-pv.xml
@@ -25,9 +25,9 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='xen'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
@@ -53,9 +53,9 @@
<mac address='00:11:22:33:44:55'/>
</interface>
<input type='mouse' bus='xen'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
+ <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
<video>
- <model type='cirrus'/>
+ <model type='qxl'/>
</video>
</devices>
</domain>
diff --git a/tests/clitest.py b/tests/clitest.py
index 42911b0..8a9fa26 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -113,14 +113,14 @@ test_files = {
'VOL' : "testvol1.img",
'DIR' : os.getcwd(),
'TREEDIR' : treedir,
- 'MANAGEDEXIST1' : "/default-pool/testvol1.img",
- 'MANAGEDEXIST2' : "/default-pool/testvol2.img",
- 'MANAGEDEXISTUPPER' : "/default-pool/UPPER",
- 'MANAGEDNEW1' : "/default-pool/clonevol",
- 'MANAGEDNEW2' : "/default-pool/clonevol",
- 'MANAGEDDISKNEW1' : "/disk-pool/newvol1.img",
- 'COLLIDE' : "/default-pool/collidevol1.img",
- 'SHARE' : "/default-pool/sharevol.img",
+ 'MANAGEDEXIST1' : "/dev/default-pool/testvol1.img",
+ 'MANAGEDEXIST2' : "/dev/default-pool/testvol2.img",
+ 'MANAGEDEXISTUPPER' : "/dev/default-pool/UPPER",
+ 'MANAGEDNEW1' : "/dev/default-pool/clonevol",
+ 'MANAGEDNEW2' : "/dev/default-pool/clonevol",
+ 'MANAGEDDISKNEW1' : "/dev/disk-pool/newvol1.img",
+ 'COLLIDE' : "/dev/default-pool/collidevol1.img",
+ 'SHARE' : "/dev/default-pool/sharevol.img",
'VIRTCONV_OUT' : "%s/test.out" % virtconv_out,
'VC_IMG1' : "%s/virtimage/test1.virt-image" % vcdir,
@@ -754,7 +754,7 @@ vclon.add_valid("misc", "-o test --auto-clone") # Auto flag, no storage
vclon.add_valid("misc", "--original-xml %(CLONE_DISK_XML)s --auto-clone") # Auto flag w/ storage,
vclon.add_valid("misc", "--original-xml %(CLONE_STORAGE_XML)s --auto-clone") # Auto flag w/ managed storage,
vclon.add_valid("misc", "-o test-for-clone --auto-clone --clone-running") # Auto flag, actual VM, skip state check
-vclon.add_valid("misc", "-o test-clone-simple -n newvm --preserve-data --file /default-pool/default-vol --clone-running --force") # Preserve data shouldn't complain about existing volume
+vclon.add_valid("misc", "-o test-clone-simple -n newvm --preserve-data --file /dev/default-pool/default-vol --clone-running --force") # Preserve data shouldn't complain about existing volume
vclon.add_invalid("misc", "--auto-clone# Auto flag, actual VM, without state skip ") # Just the auto flag
vclon.add_invalid("misc", "-o test-for-clone --auto-clone")
diff --git a/tests/clone-xml/cross-pool-in.xml b/tests/clone-xml/cross-pool-in.xml
index f6f0063..6177a6f 100644
--- a/tests/clone-xml/cross-pool-in.xml
+++ b/tests/clone-xml/cross-pool-in.xml
@@ -18,11 +18,11 @@
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='file' device='disk'>
- <source file='/default-pool/testvol2.img'/>
+ <source file='/dev/default-pool/testvol2.img'/>
<target dev='hdb' bus='ide'/>
</disk>
<interface type='network'>
diff --git a/tests/clone-xml/cross-pool-out.xml b/tests/clone-xml/cross-pool-out.xml
index 6035a5d..7127a82 100644
--- a/tests/clone-xml/cross-pool-out.xml
+++ b/tests/clone-xml/cross-pool-out.xml
@@ -19,11 +19,11 @@
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<target dev="hda" bus="ide"/>
- <source file="/cross-pool/new1.img"/>
+ <source file="/dev/cross-pool/new1.img"/>
</disk>
<disk type="file" device="disk">
<target dev="hdb" bus="ide"/>
- <source file="/cross-pool/new2.img"/>
+ <source file="/dev/cross-pool/new2.img"/>
</disk>
<interface type="network">
<mac address="22:23:45:67:89:00"/>
diff --git a/tests/clone-xml/managed-storage-in.xml b/tests/clone-xml/managed-storage-in.xml
index 0f328eb..011c9be 100644
--- a/tests/clone-xml/managed-storage-in.xml
+++ b/tests/clone-xml/managed-storage-in.xml
@@ -18,11 +18,11 @@
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='disk'>
- <source dev='/disk-pool/diskvol1'/>
+ <source dev='/dev/disk-pool/diskvol1'/>
<target dev='hdb' bus='ide'/>
</disk>
<interface type='network'>
diff --git a/tests/clone-xml/managed-storage-out.xml b/tests/clone-xml/managed-storage-out.xml
index 2b5c6f3..51a8500 100644
--- a/tests/clone-xml/managed-storage-out.xml
+++ b/tests/clone-xml/managed-storage-out.xml
@@ -19,10 +19,10 @@
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<target dev="hda" bus="ide"/>
- <source file="/default-pool/new1.img"/>
+ <source file="/dev/default-pool/new1.img"/>
</disk>
<disk type="block" device="disk">
- <source dev="/disk-pool/new2.img"/>
+ <source dev="/dev/disk-pool/new2.img"/>
<target dev="hdb" bus="ide"/>
</disk>
<interface type="network">
diff --git a/tests/clonetest.py b/tests/clonetest.py
index 65c863c..e58d3c1 100644
--- a/tests/clonetest.py
+++ b/tests/clonetest.py
@@ -29,14 +29,14 @@ CLONE_NAME = "clone-new"
# Create some files to use as test images
FILE1 = "/tmp/virtinst-test1.img"
FILE2 = "/tmp/virtinst-test2.img"
-P1_VOL1 = "/default-pool/testvol1.img"
-P1_VOL2 = "/default-pool/testvol2.img"
-P2_VOL1 = "/cross-pool/testvol1.img"
-P2_VOL2 = "/cross-pool/testvol2.img"
-
-POOL1 = "/default-pool"
-POOL2 = "/cross-pool"
-DISKPOOL = "/disk-pool"
+P1_VOL1 = "/dev/default-pool/testvol1.img"
+P1_VOL2 = "/dev/default-pool/testvol2.img"
+P2_VOL1 = "/dev/cross-pool/testvol1.img"
+P2_VOL2 = "/dev/cross-pool/testvol2.img"
+
+POOL1 = "/dev/default-pool"
+POOL2 = "/dev/cross-pool"
+DISKPOOL = "/dev/disk-pool"
local_files = [FILE1, FILE2]
diff --git a/tests/storage-xml/pool-dir-volclone.xml b/tests/storage-xml/pool-dir-volclone.xml
index 51f56f4..6160a96 100644
--- a/tests/storage-xml/pool-dir-volclone.xml
+++ b/tests/storage-xml/pool-dir-volclone.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<volume>
<name>pool-dir-volclone</name>
- <key>/some/target/path/pool-dir-vol</key>
+ <key>/dev/pool-dir-vol</key>
<source>
</source>
<capacity unit="bytes">10737418240</capacity>
<allocation unit="bytes">5368709120</allocation>
<target>
- <path>/some/target/path/pool-dir-vol</path>
+ <path>/dev/pool-dir-vol</path>
<format type="raw"/>
<permissions>
<mode>0700</mode>
diff --git a/tests/storage-xml/pool-dir.xml b/tests/storage-xml/pool-dir.xml
index 0d09a63..d2cd0f0 100644
--- a/tests/storage-xml/pool-dir.xml
+++ b/tests/storage-xml/pool-dir.xml
@@ -2,6 +2,6 @@
<name>pool-dir</name>
<uuid>10010511-4100-1051-1410-010511410010</uuid>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-disk-volclone.xml b/tests/storage-xml/pool-disk-volclone.xml
index 31e0c3a..ba95570 100644
--- a/tests/storage-xml/pool-disk-volclone.xml
+++ b/tests/storage-xml/pool-disk-volclone.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<volume>
<name>pool-disk-volclone</name>
- <key>/some/target/path/pool-disk-vol</key>
+ <key>/dev/pool-disk-vol</key>
<source>
</source>
<capacity unit="bytes">10737418240</capacity>
<allocation unit="bytes">5368709120</allocation>
<target>
- <path>/some/target/path/pool-disk-vol</path>
+ <path>/dev/pool-disk-vol</path>
<format type="none"/>
<permissions>
<mode>0700</mode>
diff --git a/tests/storage-xml/pool-disk.xml b/tests/storage-xml/pool-disk.xml
index 54f67c8..1b2bb3f 100644
--- a/tests/storage-xml/pool-disk.xml
+++ b/tests/storage-xml/pool-disk.xml
@@ -6,6 +6,6 @@
<device path="/some/source/path"/>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-fs-volclone.xml b/tests/storage-xml/pool-fs-volclone.xml
index 424e90a..ada81dc 100644
--- a/tests/storage-xml/pool-fs-volclone.xml
+++ b/tests/storage-xml/pool-fs-volclone.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<volume>
<name>pool-fs-volclone</name>
- <key>/some/target/path/pool-fs-vol</key>
+ <key>/dev/pool-fs-vol</key>
<source>
</source>
<capacity unit="bytes">10737418240</capacity>
<allocation unit="bytes">5368709120</allocation>
<target>
- <path>/some/target/path/pool-fs-vol</path>
+ <path>/dev/pool-fs-vol</path>
<format type="raw"/>
<permissions>
<mode>0700</mode>
diff --git a/tests/storage-xml/pool-fs.xml b/tests/storage-xml/pool-fs.xml
index 7396b93..834acc9 100644
--- a/tests/storage-xml/pool-fs.xml
+++ b/tests/storage-xml/pool-fs.xml
@@ -6,6 +6,6 @@
<device path='/some/source/path'/>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-iscsi-iqn.xml b/tests/storage-xml/pool-iscsi-iqn.xml
index afa3f40..341b404 100644
--- a/tests/storage-xml/pool-iscsi-iqn.xml
+++ b/tests/storage-xml/pool-iscsi-iqn.xml
@@ -9,6 +9,6 @@
</initiator>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-iscsi.xml b/tests/storage-xml/pool-iscsi.xml
index c0a877e..8abf04f 100644
--- a/tests/storage-xml/pool-iscsi.xml
+++ b/tests/storage-xml/pool-iscsi.xml
@@ -6,6 +6,6 @@
<device path="/some/source/path"/>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-logical-manydev.xml b/tests/storage-xml/pool-logical-manydev.xml
index 946e529..a931bf8 100644
--- a/tests/storage-xml/pool-logical-manydev.xml
+++ b/tests/storage-xml/pool-logical-manydev.xml
@@ -8,6 +8,6 @@
<name>pool-logical-manydev</name>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-logical-srcname.xml b/tests/storage-xml/pool-logical-srcname.xml
index 8758e65..ec2595f 100644
--- a/tests/storage-xml/pool-logical-srcname.xml
+++ b/tests/storage-xml/pool-logical-srcname.xml
@@ -6,6 +6,6 @@
<name>vgname</name>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-logical-volclone.xml b/tests/storage-xml/pool-logical-volclone.xml
index ef53c6c..5e6b4ff 100644
--- a/tests/storage-xml/pool-logical-volclone.xml
+++ b/tests/storage-xml/pool-logical-volclone.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<volume>
<name>pool-logical-volclone</name>
- <key>/some/target/path/pool-logical-vol</key>
+ <key>/dev/pool-logical/pool-logical-vol</key>
<source>
</source>
<capacity unit="bytes">10737418240</capacity>
<allocation unit="bytes">10737418240</allocation>
<target>
- <path>/some/target/path/pool-logical-vol</path>
+ <path>/dev/pool-logical/pool-logical-vol</path>
<permissions>
<mode>0700</mode>
<owner>10736</owner>
diff --git a/tests/storage-xml/pool-logical.xml b/tests/storage-xml/pool-logical.xml
index 092a2ea..ee6fd05 100644
--- a/tests/storage-xml/pool-logical.xml
+++ b/tests/storage-xml/pool-logical.xml
@@ -6,6 +6,6 @@
<name>pool-logical</name>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-mpath.xml b/tests/storage-xml/pool-mpath.xml
index 6e72994..d747049 100644
--- a/tests/storage-xml/pool-mpath.xml
+++ b/tests/storage-xml/pool-mpath.xml
@@ -2,6 +2,6 @@
<name>pool-mpath</name>
<uuid>10911297-1161-0410-9112-971161041091</uuid>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-netfs-volclone.xml b/tests/storage-xml/pool-netfs-volclone.xml
index f71b67e..506d0cd 100644
--- a/tests/storage-xml/pool-netfs-volclone.xml
+++ b/tests/storage-xml/pool-netfs-volclone.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<volume>
<name>pool-netfs-volclone</name>
- <key>/some/target/path/pool-netfs-vol</key>
+ <key>/dev/pool-netfs-vol</key>
<source>
</source>
<capacity unit="bytes">10737418240</capacity>
<allocation unit="bytes">5368709120</allocation>
<target>
- <path>/some/target/path/pool-netfs-vol</path>
+ <path>/dev/pool-netfs-vol</path>
<format type="raw"/>
<permissions>
<mode>0700</mode>
diff --git a/tests/storage-xml/pool-netfs.xml b/tests/storage-xml/pool-netfs.xml
index 91a529f..7ac3a04 100644
--- a/tests/storage-xml/pool-netfs.xml
+++ b/tests/storage-xml/pool-netfs.xml
@@ -7,6 +7,6 @@
<dir path="/some/source/path"/>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage-xml/pool-scsi.xml b/tests/storage-xml/pool-scsi.xml
index bf6aaea..6aef09d 100644
--- a/tests/storage-xml/pool-scsi.xml
+++ b/tests/storage-xml/pool-scsi.xml
@@ -5,6 +5,6 @@
<adapter name="/some/source/path"/>
</source>
<target>
- <path>/some/target/path</path>
+ <path>/dev</path>
</target>
</pool>
diff --git a/tests/storage.py b/tests/storage.py
index de530eb..07c92a3 100644
--- a/tests/storage.py
+++ b/tests/storage.py
@@ -75,7 +75,7 @@ def createPool(conn, ptype, poolname=None, fmt=None, target_path=None,
if hasattr(pool_inst, "source_path"):
pool_inst.source_path = source_path or "/some/source/path"
if hasattr(pool_inst, "target_path"):
- pool_inst.target_path = target_path or "/some/target/path"
+ pool_inst.target_path = target_path or "/dev"
if fmt and hasattr(pool_inst, "format"):
pool_inst.format = fmt
if source_name and hasattr(pool_inst, "source_name"):
diff --git a/tests/testdriver.xml b/tests/testdriver.xml
index 447e207..d085af2 100644
--- a/tests/testdriver.xml
+++ b/tests/testdriver.xml
@@ -324,7 +324,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
- <source file='/default-pool/default-vol'/>
+ <source file='/dev/default-pool/default-vol'/>
<target dev='hda' bus='ide'/>
</disk>
<interface type='network'>
@@ -368,7 +368,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
- <source file='/default-pool/test-clone-simple.img'/>
+ <source file='/dev/default-pool/test-clone-simple.img'/>
<target dev='hda' bus='ide'/>
</disk>
<interface type='user'>
@@ -402,11 +402,12 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='floppy'>
- <source dev='/disk-pool/diskvol1'/>
+ <source dev='/dev/disk-pool/diskvol1'/>
<target dev='fda' bus='fdc'/>
+ <driver type="vmdk"/>
</disk>
<disk type='block' device='disk'>
- <source dev='/disk-pool/diskvol2'/>
+ <source dev='/dev/disk-pool/diskvol2'/>
<target dev='sda' bus='scsi'/>
<readonly/>
</disk>
@@ -414,17 +415,18 @@
<target dev='sdb' bus='scsi'/>
</disk>
<disk type='block' device='disk'>
- <source dev='/default-pool/collidevol1.img'/>
+ <source dev='/dev/default-pool/collidevol1.img'/>
<target dev='sdc' bus='scsi'/>
+ <driver type="qcow2"/>
<readonly/>
<shareable/>
</disk>
<disk type='file' device='disk'>
- <source file='/default-pool/default-vol'/>
+ <source file='/dev/default-pool/default-vol'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='file' device='disk'>
- <source file='/default-pool/testvol2.img'/>
+ <source file='/dev/default-pool/testvol2.img'/>
<target dev='hdb' bus='ide'/>
</disk>
<interface type='network'>
@@ -755,7 +757,7 @@
<source>
</source>
<target>
- <path>/default-pool</path>
+ <path>/dev/default-pool</path>
<permissions>
<mode>0700</mode>
<owner>10736</owner>
@@ -953,7 +955,7 @@
<source>
</source>
<target>
- <path>/cross-pool</path>
+ <path>/dev/cross-pool</path>
<permissions>
<mode>0700</mode>
<owner>10736</owner>
@@ -1072,7 +1074,7 @@
<source>
</source>
<target>
- <path>/disk-pool</path>
+ <path>/dev/disk-pool</path>
<permissions>
<mode>0700</mode>
<owner>10736</owner>
@@ -1104,7 +1106,6 @@
<source>
<host name="iscsi.example.com"/>
<device path="demo-target"/>
- <auth type='chap' login='foobar' passwd='frobbar'/>
</source>
<target>
<path>/iscsi-pool</path>
diff --git a/tests/utils.py b/tests/utils.py
index 44d8562..438f291 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -211,7 +211,7 @@ def make_import_installer(os_type="hvm"):
return inst
-def make_distro_installer(location="/default-pool/default-vol", gtype="xen"):
+def make_distro_installer(location="/dev/default-pool/default-vol", gtype="xen"):
inst = virtinst.DistroInstaller(type=gtype, os_type="hvm", conn=_conn,
location=location)
return inst
@@ -243,7 +243,7 @@ def build_win_kvm(path=None):
def get_floppy(path=None):
if not path:
- path = "/default-pool/testvol1.img"
+ path = "/dev/default-pool/testvol1.img"
return VirtualDisk(path, conn=_conn, device=VirtualDisk.DEVICE_FLOPPY)
diff --git a/tests/validation.py b/tests/validation.py
index e02bb85..a384afb 100644
--- a/tests/validation.py
+++ b/tests/validation.py
@@ -133,8 +133,8 @@ args = {
{'path' : None, 'device' : VirtualDisk.DEVICE_CDROM},
{'path' : None, 'device' : VirtualDisk.DEVICE_FLOPPY},
{'conn' : testconn, 'volName' : ("default-pool", "default-vol")},
- {'conn' : testconn, 'path' : "/default-pool/default-vol"},
- {'conn' : testconn, 'path' : "/default-pool/vol-noexist", 'size' : 1},
+ {'conn' : testconn, 'path' : "/dev/default-pool/default-vol"},
+ {'conn' : testconn, 'path' : "/dev/default-pool/vol-noexist", 'size' : 1},
{'conn' : testconn, 'volInstall': volinst},
{'path' : 'nonexist', 'size' : 1, 'driverCache' : 'writethrough'},
# Full pool, but we are nonsparse
diff --git a/tests/xmlconfig-xml/boot-many-devices.xml b/tests/xmlconfig-xml/boot-many-devices.xml
index 64c0a5e..4b63570 100644
--- a/tests/xmlconfig-xml/boot-many-devices.xml
+++ b/tests/xmlconfig-xml/boot-many-devices.xml
@@ -36,7 +36,7 @@
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='sdb' bus='scsi'/>
<address type='spapr-vio'/>
</disk>
diff --git a/tests/xmlconfig-xml/install-f11-ac97.xml b/tests/xmlconfig-xml/install-f11-ac97.xml
index 7e0b468..c017594 100644
--- a/tests/xmlconfig-xml/install-f11-ac97.xml
+++ b/tests/xmlconfig-xml/install-f11-ac97.xml
@@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='disk'>
diff --git a/tests/xmlconfig-xml/install-f11-noac97.xml b/tests/xmlconfig-xml/install-f11-noac97.xml
index f953456..24ed598 100644
--- a/tests/xmlconfig-xml/install-f11-noac97.xml
+++ b/tests/xmlconfig-xml/install-f11-noac97.xml
@@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='disk'>
diff --git a/tests/xmlconfig-xml/install-f11-qemu.xml b/tests/xmlconfig-xml/install-f11-qemu.xml
index 065d196..685ccd4 100644
--- a/tests/xmlconfig-xml/install-f11-qemu.xml
+++ b/tests/xmlconfig-xml/install-f11-qemu.xml
@@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='disk'>
diff --git a/tests/xmlconfig-xml/install-f11-xen.xml b/tests/xmlconfig-xml/install-f11-xen.xml
index 3a738a1..b902126 100644
--- a/tests/xmlconfig-xml/install-f11-xen.xml
+++ b/tests/xmlconfig-xml/install-f11-xen.xml
@@ -19,7 +19,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='disk'>
diff --git a/tests/xmlconfig-xml/install-f11.xml b/tests/xmlconfig-xml/install-f11.xml
index bd02f64..ccf30d6 100644
--- a/tests/xmlconfig-xml/install-f11.xml
+++ b/tests/xmlconfig-xml/install-f11.xml
@@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='disk'>
diff --git a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
index 25a796e..0cf03b5 100644
--- a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
+++ b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
@@ -21,7 +21,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/iso-vol'/>
+ <source file='/dev/default-pool/iso-vol'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='cdrom'>
diff --git a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
index 91b6bf2..1191320 100644
--- a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
+++ b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
@@ -21,7 +21,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
- <source file='/default-pool/iso-vol'/>
+ <source file='/dev/default-pool/iso-vol'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='cdrom'>
diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml
index 2ad7909..75afd3d 100644
--- a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml
+++ b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml
@@ -21,12 +21,12 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
- <source file='/default-pool/rhel6.img'/>
+ <source file='/dev/default-pool/rhel6.img'/>
<target dev='vda' bus='virtio'/>
</disk>
<disk type='block' device='disk'>
diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml
index 04166e6..a679b5a 100644
--- a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml
+++ b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml
@@ -19,12 +19,12 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
- <source file='/default-pool/rhel6.img'/>
+ <source file='/dev/default-pool/rhel6.img'/>
<target dev='vda' bus='virtio'/>
</disk>
<disk type='block' device='disk'>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage1.xml b/tests/xmlconfig-xml/winxp-kvm-stage1.xml
index 772c435..b4a84ac 100644
--- a/tests/xmlconfig-xml/winxp-kvm-stage1.xml
+++ b/tests/xmlconfig-xml/winxp-kvm-stage1.xml
@@ -20,7 +20,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
- <source file='/default-pool/winxp.img'/>
+ <source file='/dev/default-pool/winxp.img'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='disk'>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage2.xml b/tests/xmlconfig-xml/winxp-kvm-stage2.xml
index 5e787df..b858c29 100644
--- a/tests/xmlconfig-xml/winxp-kvm-stage2.xml
+++ b/tests/xmlconfig-xml/winxp-kvm-stage2.xml
@@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
- <source file='/default-pool/winxp.img'/>
+ <source file='/dev/default-pool/winxp.img'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='disk'>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage3.xml b/tests/xmlconfig-xml/winxp-kvm-stage3.xml
index 7be8ee4..a926a0f 100644
--- a/tests/xmlconfig-xml/winxp-kvm-stage3.xml
+++ b/tests/xmlconfig-xml/winxp-kvm-stage3.xml
@@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
- <source file='/default-pool/winxp.img'/>
+ <source file='/dev/default-pool/winxp.img'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='disk'>
diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py
index b200dfe..e691130 100644
--- a/tests/xmlconfig.py
+++ b/tests/xmlconfig.py
@@ -394,11 +394,11 @@ class TestXMLConfig(unittest.TestCase):
self._compare(g, "misc-qemu-driver-type", True)
g = utils.get_basic_fullyvirt_guest()
- g.add_device(utils.get_filedisk("/default-pool/iso-vol"))
+ g.add_device(utils.get_filedisk("/dev/default-pool/iso-vol"))
self._compare(g, "misc-qemu-iso-disk", True)
g = utils.get_basic_fullyvirt_guest()
- g.add_device(utils.get_filedisk("/default-pool/iso-vol"))
+ g.add_device(utils.get_filedisk("/dev/default-pool/iso-vol"))
g.get_devices("disk")[0].driver_type = "qcow2"
self._compare(g, "misc-qemu-driver-overwrite", True)
@@ -506,17 +506,17 @@ class TestXMLConfig(unittest.TestCase):
def testInstallWindowsKVM(self):
utils.set_conn(_plainkvm)
- g = utils.build_win_kvm("/default-pool/winxp.img")
+ g = utils.build_win_kvm("/dev/default-pool/winxp.img")
self._compare(g, "winxp-kvm-stage1", True)
def testContinueWindowsKVM(self):
utils.set_conn(_plainkvm)
- g = utils.build_win_kvm("/default-pool/winxp.img")
+ g = utils.build_win_kvm("/dev/default-pool/winxp.img")
self._compare(g, "winxp-kvm-stage2", True, True)
def testBootWindowsKVM(self):
utils.set_conn(_plainkvm)
- g = utils.build_win_kvm("/default-pool/winxp.img")
+ g = utils.build_win_kvm("/dev/default-pool/winxp.img")
self._compare(g, "winxp-kvm-stage3", False)
@@ -699,7 +699,7 @@ class TestXMLConfig(unittest.TestCase):
g.add_device(VirtualDisk(conn=g.conn, path="/dev/loop0",
bus="scsi"))
g.add_device(VirtualDisk(conn=g.conn, path="/tmp", device="floppy"))
- d3 = VirtualDisk(conn=g.conn, path="/default-pool/testvol1.img",
+ d3 = VirtualDisk(conn=g.conn, path="/dev/default-pool/testvol1.img",
bus="scsi", driverName="qemu")
d3.address.type = "spapr-vio"
g.add_device(d3)
@@ -867,7 +867,7 @@ class TestXMLConfig(unittest.TestCase):
gtype="kvm")
g = utils.get_basic_fullyvirt_guest("kvm", installer=i)
g.add_device(utils.get_floppy())
- g.add_device(utils.get_filedisk("/default-pool/rhel6.img"))
+ g.add_device(utils.get_filedisk("/dev/default-pool/rhel6.img"))
g.add_device(utils.get_blkdisk())
g.add_device(utils.get_virtual_network())
g.add_device(VirtualAudio())
@@ -886,7 +886,7 @@ class TestXMLConfig(unittest.TestCase):
def testFullKVMWinxp(self):
utils.set_conn(_plainkvm)
- g = utils.build_win_kvm("/default-pool/winxp.img")
+ g = utils.build_win_kvm("/dev/default-pool/winxp.img")
self._testInstall(g, "winxp-kvm-stage1",
"winxp-kvm-stage3", "winxp-kvm-stage2")
@@ -964,7 +964,7 @@ class TestXMLConfig(unittest.TestCase):
def testManyVirtio(self):
d = VirtualDisk(conn=utils.get_conn(), bus="virtio",
- path="/default-pool/testvol1.img")
+ path="/dev/default-pool/testvol1.img")
targetlist = []
for ignore in range(0, (26 * 2) + 1):
diff --git a/tests/xmlparse-xml/add-devices-in.xml b/tests/xmlparse-xml/add-devices-in.xml
index e733c75..9e225f0 100644
--- a/tests/xmlparse-xml/add-devices-in.xml
+++ b/tests/xmlparse-xml/add-devices-in.xml
@@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
- <source file="/default-pool/testvol1.img"/>
+ <source file="/dev/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">
diff --git a/tests/xmlparse-xml/add-devices-out.xml b/tests/xmlparse-xml/add-devices-out.xml
index 114088a..acc067a 100644
--- a/tests/xmlparse-xml/add-devices-out.xml
+++ b/tests/xmlparse-xml/add-devices-out.xml
@@ -19,7 +19,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
- <source file="/default-pool/testvol1.img"/>
+ <source file="/dev/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">
diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/xmlparse-xml/change-disk-out.xml
index 73f0764..ebccd57 100644
--- a/tests/xmlparse-xml/change-disk-out.xml
+++ b/tests/xmlparse-xml/change-disk-out.xml
@@ -42,7 +42,7 @@
</disk>
<disk type="file" device="floppy">
<target dev="fda" bus="fdc"/>
- <source file="/default-pool/default-vol"/>
+ <source file="/dev/default-pool/default-vol"/>
<shareable/>
<driver cache="writeback" io="native"/>
</disk>
diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/xmlparse-xml/change-guest-in.xml
index b6ab49c..ab56c03 100644
--- a/tests/xmlparse-xml/change-guest-in.xml
+++ b/tests/xmlparse-xml/change-guest-in.xml
@@ -29,7 +29,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
- <source file="/default-pool/testvol1.img"/>
+ <source file="/dev/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">
diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml
index 7a498fd..c0d3e72 100644
--- a/tests/xmlparse-xml/change-guest-out.xml
+++ b/tests/xmlparse-xml/change-guest-out.xml
@@ -32,7 +32,7 @@
<emulator>/usr/binnnn/fooemu</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
- <source file="/default-pool/testvol1.img"/>
+ <source file="/dev/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">
diff --git a/tests/xmlparse-xml/change-media-out.xml b/tests/xmlparse-xml/change-media-out.xml
index 10e2df4..c27320c 100644
--- a/tests/xmlparse-xml/change-media-out.xml
+++ b/tests/xmlparse-xml/change-media-out.xml
@@ -13,27 +13,27 @@
<disk type="file" device="cdrom">
<target dev="hda" bus="ide"/>
<driver name="qemu" type="qcow2"/>
- <source file="/default-pool/default-vol"/>
+ <source file="/dev/default-pool/default-vol"/>
</disk>
<disk type="file" device="cdrom">
<target dev="hdb" bus="ide"/>
<driver name="qemu" type="qcow2"/>
- <source file="/disk-pool/diskvol1"/>
+ <source file="/dev/disk-pool/diskvol1"/>
</disk>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<driver name="qemu" type="raw"/>
- <source dev="/disk-pool/diskvol1"/>
+ <source dev="/dev/disk-pool/diskvol1"/>
</disk>
<disk type="file" device="floppy">
<target dev="fda" bus="fdc"/>
<driver name="qemu" type="qcow2"/>
- <source file="/default-pool/default-vol"/>
+ <source file="/dev/default-pool/default-vol"/>
</disk>
<disk type="block" device="floppy">
<target dev="fdb" bus="fdc"/>
<driver name="qemu" type="raw"/>
- <source dev="/disk-pool/diskvol1"/>
+ <source dev="/dev/disk-pool/diskvol1"/>
</disk>
</devices>
</domain>
diff --git a/tests/xmlparse-xml/change-smartcard-in.xml b/tests/xmlparse-xml/change-smartcard-in.xml
index 944f03e..5033e8e 100644
--- a/tests/xmlparse-xml/change-smartcard-in.xml
+++ b/tests/xmlparse-xml/change-smartcard-in.xml
@@ -26,7 +26,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
- <source file='/default-pool/testvol1.img'/>
+ <source file='/dev/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='disk'>
diff --git a/tests/xmlparse-xml/change-smartcard-out.xml b/tests/xmlparse-xml/change-smartcard-out.xml
index 91b9d4f..72305af 100644
--- a/tests/xmlparse-xml/change-smartcard-out.xml
+++ b/tests/xmlparse-xml/change-smartcard-out.xml
@@ -26,7 +26,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
- <source file="/default-pool/testvol1.img"/>
+ <source file="/dev/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index 358f5a8..e19bfdb 100644
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@@ -281,7 +281,7 @@ class XMLParseTest(unittest.TestCase):
check("error_policy", "stop", None)
check = self._make_checker(disk3)
- check("path", None, "/default-pool/default-vol")
+ check("path", None, "/dev/default-pool/default-vol")
check("shareable", False, True)
check("driver_cache", None, "writeback")
check("driver_io", None, "threads")
@@ -799,24 +799,24 @@ class XMLParseTest(unittest.TestCase):
disk = guest.get_devices("disk")[0]
check = self._make_checker(disk)
- check("path", None, "/default-pool/default-vol")
+ check("path", None, "/dev/default-pool/default-vol")
disk = guest.get_devices("disk")[1]
check = self._make_checker(disk)
- check("path", None, "/default-pool/default-vol")
- check("path", "/default-pool/default-vol", "/disk-pool/diskvol1")
+ check("path", None, "/dev/default-pool/default-vol")
+ check("path", "/dev/default-pool/default-vol", "/dev/disk-pool/diskvol1")
disk = guest.get_devices("disk")[2]
check = self._make_checker(disk)
- check("path", None, "/disk-pool/diskvol1")
+ check("path", None, "/dev/disk-pool/diskvol1")
disk = guest.get_devices("disk")[3]
check = self._make_checker(disk)
- check("path", None, "/default-pool/default-vol")
+ check("path", None, "/dev/default-pool/default-vol")
disk = guest.get_devices("disk")[4]
check = self._make_checker(disk)
- check("path", None, "/disk-pool/diskvol1")
+ check("path", None, "/dev/disk-pool/diskvol1")
diff --git a/virtinst/Guest.py b/virtinst/Guest.py
index 54a8fae..b818be4 100644
--- a/virtinst/Guest.py
+++ b/virtinst/Guest.py
@@ -314,7 +314,7 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain):
def get_memory(self):
return self._memory
def set_memory(self, val):
- if not isinstance(val, int) or val <= 0:
+ if not isinstance(val, (int, long)) or val <= 0:
raise ValueError(_("Memory value must be an integer greater "
"than 0"))
self._memory = val
@@ -332,7 +332,7 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain):
def get_maxmemory(self):
return self._maxmemory
def set_maxmemory(self, val):
- if not isinstance(val, int) or val <= 0:
+ if not isinstance(val, (int, long)) or val <= 0:
raise ValueError(_("Max Memory value must be an integer greater "
"than 0"))
self._maxmemory = val
--
1.8.3.2