NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reduce test suites clear_cache calls

Browse Source
This commit is contained in:
Cole Robinson 2014-02-08 19:05:26 -05:00
parent c5f6c6852a
commit 98ea4cdad2
49 changed files with 98 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cli-test-xml/compare/virt-install-arm-vexpress-f19.xml
View File

@ -23,8 +23,8 @@
<devices>
<emulator>/usr/bin/qemu-system-arm</emulator>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<interface type="bridge">

4
tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
View File

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

8
tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml
View File

@ -43,8 +43,8 @@
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
@ -112,8 +112,8 @@
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>

24
tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -28,13 +28,13 @@
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist2.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
@ -88,13 +88,13 @@
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist2.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
@ -148,13 +148,13 @@
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist2.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>

4
tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
View File

@ -20,8 +20,8 @@
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="sda" bus="scsi"/>
</disk>
<interface type="bridge">

12
tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
View File

@ -24,11 +24,11 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<source file="/tmp/__virtinst_cli_exist2.img"/>
<source file="/dev/default-pool/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
@ -65,11 +65,11 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<source file="/tmp/__virtinst_cli_exist2.img"/>
<source file="/dev/default-pool/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
@ -106,11 +106,11 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<source file="/tmp/__virtinst_cli_exist2.img"/>
<source file="/dev/default-pool/testvol2.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>

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

@ -10,7 +10,7 @@
<on_crash>restart</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type="bridge">

4
tests/cli-test-xml/compare/virt-install-xen-hvm.xml
View File

@ -22,11 +22,11 @@
<devices>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>

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

@ -10,7 +10,7 @@
<on_crash>restart</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type="bridge">

4
tests/cli-test-xml/compare/virt-install-xen-ia64-hvm.xml
View File

@ -22,7 +22,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<interface type="bridge">
@ -58,7 +58,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<interface type="bridge">

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

@ -15,7 +15,7 @@
<on_crash>destroy</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type="bridge">
@ -40,7 +40,7 @@
<on_crash>restart</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type="bridge">

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

@ -15,7 +15,7 @@
<on_crash>destroy</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type="bridge">
@ -41,7 +41,7 @@
<on_crash>restart</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type="bridge">

35
tests/clitest.py
View File

@ -99,20 +99,17 @@ test_files = {
'NEWCLONEIMG1' : new_images[0],
'NEWCLONEIMG2' : new_images[1],
'NEWCLONEIMG3' : new_images[2],
'AUTOMANAGEIMG' : "/some/new/pool/dir/new.img",
'EXISTIMG1' : exist_images[0],
'EXISTIMG2' : exist_images[1],
'AUTOMANAGEIMG' : "/some/new/pool/dir/new",
'EXISTIMG1' : "/dev/default-pool/testvol1.img",
'EXISTIMG2' : "/dev/default-pool/testvol2.img",
'EXISTUPPER' : "/dev/default-pool/UPPER",
'ROIMG' : ro_img,
'ROIMGNOEXIST' : ro_noexist_img,
'POOL' : "default-pool",
'VOL' : "testvol1.img",
'DIR' : os.getcwd(),
'TREEDIR' : treedir,
'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",
@ -547,7 +544,7 @@ c.add_compare("""--hvm --pxe \
--controller usb,model=ich9-uhci1,address=0:0:4.0,index=0,master=0 \
--controller usb,model=ich9-uhci2,address=0:0:4.1,index=0,master=2 \
--controller usb,model=ich9-uhci3,address=0:0:4.2,index=0,master=4 \
--disk %(MANAGEDEXISTUPPER)s,cache=writeback,io=threads,perms=sh,serial=WD-WMAP9A966149 \
--disk %(EXISTUPPER)s,cache=writeback,io=threads,perms=sh,serial=WD-WMAP9A966149 \
--disk %(NEWIMG1)s,sparse=false,size=.001,perms=ro,error_policy=enospace \
--disk device=cdrom,bus=sata,read_bytes_sec=1,read_iops_sec=2,total_bytes_sec=10,total_iops_sec=20,write_bytes_sec=5,write_iops_sec=6 \
--serial tcp,host=:2222,mode=bind,protocol=telnet \
@ -568,12 +565,12 @@ c.add_compare("""--hvm --pxe \
--clock offset=localtime,hpet_present=no,rtc_tickpolicy=merge \
--pm suspend_to_mem=yes,suspend_to_disk=no \
""", "many-devices") # Lots of devices
c.add_valid("--hvm --disk path=virt-install,device=cdrom") # Specifying cdrom media via --disk
c.add_valid("--hvm --import --disk path=virt-install") # FV Import install
c.add_valid("--hvm --import --disk path=virt-install --prompt --force") # Working scenario w/ prompt shouldn't ask anything
c.add_valid("--paravirt --import --disk path=virt-install") # PV Import install
c.add_valid("--paravirt --import --disk path=virt-install --print-xml") # PV Import install, print single XML
c.add_valid("--hvm --import --disk path=virt-install,device=floppy") # Import a floppy disk
c.add_valid("--hvm --disk path=%(EXISTIMG1)s,device=cdrom") # Specifying cdrom media via --disk
c.add_valid("--hvm --import --disk path=%(EXISTIMG1)s") # FV Import install
c.add_valid("--hvm --import --disk path=%(EXISTIMG1)s --prompt --force") # Working scenario w/ prompt shouldn't ask anything
c.add_valid("--paravirt --import --disk path=%(EXISTIMG1)s") # PV Import install
c.add_valid("--paravirt --import --disk path=%(EXISTIMG1)s --print-xml") # PV Import install, print single XML
c.add_valid("--hvm --import --disk path=%(EXISTIMG1)s,device=floppy") # Import a floppy disk
c.add_valid("--hvm --nodisks --pxe --autostart") # --autostart flag
c.add_valid("--hvm --nodisks --pxe --description \"foobar & baz\"") # --description
c.add_valid("--hvm --cdrom %(EXISTIMG2)s --file %(EXISTIMG1)s --os-variant win2k3 --wait 0") # HVM windows install with disk
@ -597,7 +594,7 @@ c.add_invalid("--nodisks --pxe --name test") # Colliding name
c.add_invalid("--hvm --nodisks --pxe --watchdog default,action=foobar") # Busted --watchdog
c.add_invalid("--hvm --nodisks --pxe --soundhw default --soundhw foobar") # Busted --soundhw
c.add_invalid("--hvm --nodisks --pxe --security type=foobar") # Busted --security
c.add_invalid("--paravirt --import --disk path=virt-install --print-step 2") # PV Import install, no second XML step
c.add_invalid("--paravirt --import --disk path=%(EXISTIMG1)s --print-step 2") # PV Import install, no second XML step
c.add_invalid("--hvm --nodisks --pxe --print-xml") # 2 stage install with --print-xml
c.add_invalid("--hvm --nodisks --pxe --memballoon foobar") # Busted --memballoon
@ -651,15 +648,13 @@ c.add_invalid("--graphics vnc --vnclisten 1.2.3.4") # mixing old and new
c = vinst.add_category("remote", "--connect %(REMOTEURI)s --nographics --noautoconsole")
c.add_valid("--nodisks --pxe") # Simple pxe nodisks
c.add_valid("--nodisks --cdrom %(MANAGEDEXIST1)s") # Managed CDROM install
c.add_valid("--pxe --file %(MANAGEDEXIST1)s") # Using existing managed storage
c.add_valid("--pxe --disk vol=%(POOL)s/%(VOL)s") # Using existing managed storage 2
c.add_valid("--pxe --disk pool=%(POOL)s,size=.04") # Creating storage on managed pool
c.add_valid("--pxe --disk /foo/bar/baz,size=.01") # Creating any random path on the remote host
c.add_valid("--pxe --disk /dev/zde") # /dev file that we just pass through to the remote VM
c.add_invalid("--pxe --disk /foo/bar/baz") # File that doesn't exist after auto storage setup
c.add_invalid("--nodisks --location /tmp") # Use of --location
c.add_invalid("--file %(EXISTIMG1)s --pxe") # Trying to use unmanaged storage
c.add_invalid("--file /foo/bar/baz --pxe") # Trying to use unmanaged storage without size argument
c = vinst.add_category("network", "--pxe --nographics --noautoconsole --nodisks")
@ -691,8 +686,6 @@ c.add_valid(" --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=s
c.add_valid("--disk path=%(NEWIMG1)s,format=raw,size=.0000001") # Unmanaged file using format 'raw'
c.add_valid("--disk path=%(MANAGEDNEW1)s,format=raw,size=.0000001") # Managed file using format raw
c.add_valid("--disk path=%(MANAGEDNEW1)s,format=qcow2,size=.0000001") # Managed file using format qcow2
c.add_valid("--disk path=%(ROIMG)s,perms=ro") # Using ro path as a disk with readonly flag
c.add_valid("--disk path=%(ROIMG)s,device=cdrom") # Using RO path with cdrom dev
c.add_valid("--disk %(EXISTIMG1)s") # Not specifying path=
c.add_valid("--disk %(NEWIMG1)s,format=raw,size=.0000001") # Not specifying path= but creating storage
c.add_valid("--disk %(COLLIDE)s --force") # Colliding storage with --force
@ -746,7 +739,6 @@ c.add_invalid("--host-device 300:400") # Parseable hostdev, but unknown digits
c = vinst.add_category("install", "--nographics --noautoconsole --nodisks")
c.add_valid("--hvm --cdrom %(EXISTIMG1)s") # Simple cdrom install
c.add_valid("--hvm --cdrom %(MANAGEDEXIST1)s") # Cdrom install with managed storage
c.add_valid("--hvm --wait 0 --os-variant winxp --cdrom %(EXISTIMG1)s") # Windows (2 stage) install
c.add_valid("--hvm --pxe --virt-type test") # Explicit virt-type
c.add_valid("--arch i686 --pxe") # Explicity fullvirt + arch
@ -756,7 +748,6 @@ c.add_valid("--hvm --location %(TREEDIR)s --initrd-inject virt-install --extra-a
c.add_valid("--hvm --location %(TREEDIR)s --extra-args console=ttyS0") # Directory tree URL install with extra-args
c.add_valid("--hvm --cdrom %(TREEDIR)s") # Directory tree CDROM install
c.add_valid("--paravirt --location %(TREEDIR)s") # Paravirt location
c.add_valid("--hvm --cdrom %(ROIMG)s") # Using ro path as a cd media
c.add_valid("--paravirt --location %(TREEDIR)s --os-variant none") # Paravirt location with --os-variant none
c.add_valid("--hvm --location %(TREEDIR)s --os-variant fedora12") # URL install with manual os-variant
c.add_valid("--hvm --pxe --boot menu=on") # Boot menu

2
tests/utils.py
View File

@ -316,7 +316,7 @@ def get_floppy(path=None):
def get_filedisk(path=None, fake=True):
if not path:
path = "/tmp/test.img"
path = "/dev/default-pool/new-test-suite.img"
d = VirtualDisk(_conn)
d.path = path
size = None

2
tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
View File

@ -20,7 +20,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="block" device="cdrom">

2
tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml
View File

@ -21,7 +21,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type="mouse" bus="ps2"/>

2
tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
View File

@ -20,7 +20,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type="mouse" bus="ps2"/>

2
tests/xmlconfig-xml/boot-many-chars.xml
View File

@ -27,7 +27,7 @@
<protocol type="telnet"/>
</serial>
<parallel type="unix">
<source mode="bind" path="/tmp/foobar"/>
<source mode="bind" path="/dev/default-pool/foobar"/>
</parallel>
<parallel type="udp">
<source mode="bind" host="my.bind.host" service="1111"/>

4
tests/xmlconfig-xml/boot-many-devices.xml
View File

@ -64,12 +64,12 @@
<graphics type="vnc" port="-1" keymap="ja"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<graphics type="vnc" port="-1"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<graphics type="sdl" display=":3.4" xauth="/dev/default-pool/.Xauthority"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes" keymap="en-us" passwdValidTo="foobar"/>
<graphics type="sdl" display="foodisplay" xauth="fooxauth"/>
<serial type="null"/>
<parallel type="unix">
<source mode="bind" path="/tmp/foobar"/>
<source mode="bind" path="/dev/default-pool/foobar"/>
</parallel>
<console type="pty"/>
<channel type="spicevmc">

2
tests/xmlconfig-xml/boot-many-disks2.xml
View File

@ -20,7 +20,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml
View File

@ -11,7 +11,7 @@
<devices>
<disk type="file" device="disk">
<driver name="file"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

2
tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml
View File

@ -11,7 +11,7 @@
<devices>
<disk type="file" device="disk">
<driver name="tap" type="qcow"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

2
tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml
View File

@ -11,7 +11,7 @@
<devices>
<disk type="file" device="disk">
<driver name="tap"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

2
tests/xmlconfig-xml/boot-paravirt-disk-file.xml
View File

@ -10,7 +10,7 @@
<on_crash>restart</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/somerandomfilename.img"/>
<source file="/dev/default-pool/somerandomfilename.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

4
tests/xmlconfig-xml/boot-paravirt-many-disks.xml
View File

@ -10,12 +10,12 @@
<on_crash>restart</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/test1.img"/>
<source file="/dev/default-pool/test1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<disk type="file" device="disk">
<driver name="tap" type="qcow"/>
<source file="/tmp/test2.img"/>
<source file="/dev/default-pool/test2.img"/>
<target dev="xvdb" bus="xen"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-f10.xml
View File

@ -25,7 +25,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-f11-ac97.xml
View File

@ -29,7 +29,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-f11-noac97.xml
View File

@ -25,7 +25,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-f11-norheldefaults.xml
View File

@ -29,7 +29,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-f11-qemu.xml
View File

@ -29,7 +29,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-f11-rheldefaults.xml
View File

@ -29,7 +29,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-f11-xen.xml
View File

@ -24,7 +24,7 @@
<target dev="fda" bus="fdc"/>
</disk>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-f11.xml
View File

@ -29,7 +29,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
View File

@ -21,7 +21,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">

2
tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml
View File

@ -22,7 +22,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type="mouse" bus="ps2"/>

2
tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml
View File

@ -24,7 +24,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type="mouse" bus="ps2"/>

2
tests/xmlconfig-xml/install-fullyvirt-import.xml
View File

@ -20,7 +20,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type="mouse" bus="ps2"/>

2
tests/xmlconfig-xml/install-fullyvirt-pxe.xml
View File

@ -21,7 +21,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type="mouse" bus="ps2"/>

2
tests/xmlconfig-xml/install-paravirt-disk-drv-file.xml
View File

@ -15,7 +15,7 @@
<devices>
<disk type="file" device="disk">
<driver name="file"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

2
tests/xmlconfig-xml/install-paravirt-disk-drv-tap-qcow.xml
View File

@ -15,7 +15,7 @@
<devices>
<disk type="file" device="disk">
<driver name="tap" type="qcow"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

2
tests/xmlconfig-xml/install-paravirt-disk-drv-tap.xml
View File

@ -15,7 +15,7 @@
<devices>
<disk type="file" device="disk">
<driver name="tap"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

2
tests/xmlconfig-xml/install-paravirt-disk-file.xml
View File

@ -14,7 +14,7 @@
<on_crash>destroy</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

2
tests/xmlconfig-xml/install-paravirt-import.xml
View File

@ -10,7 +10,7 @@
<on_crash>restart</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type="mouse" bus="xen"/>

4
tests/xmlconfig-xml/install-paravirt-many-disks.xml
View File

@ -14,12 +14,12 @@
<on_crash>destroy</on_crash>
<devices>
<disk type="file" device="disk">
<source file="/tmp/test1.img"/>
<source file="/dev/default-pool/test1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<disk type="file" device="disk">
<driver name="tap" type="qcow"/>
<source file="/tmp/test2.img"/>
<source file="/dev/default-pool/test2.img"/>
<target dev="xvdb" bus="xen"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-windowsxp-xennew.xml
View File

@ -21,7 +21,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/install-windowsxp-xenold.xml
View File

@ -17,7 +17,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/misc-qemu-driver-type.xml
View File

@ -26,7 +26,7 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<source file="/dev/default-pool/new-test-suite.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="block" device="disk">

2
tests/xmlconfig-xml/misc-xml-escaping.xml
View File

@ -24,7 +24,7 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<source file="/tmp/ISO&amp;'&amp;s"/>
<source file="/dev/default-pool/ISO&amp;'&amp;s"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">

18
tests/xmlconfig.py
View File

@ -123,7 +123,7 @@ class TestXMLConfig(unittest.TestCase):
def testBootParavirtDiskFile(self):
g = utils.get_basic_paravirt_guest()
g.add_device(utils.get_filedisk("/tmp/somerandomfilename.img"))
g.add_device(utils.get_filedisk("/dev/default-pool/somerandomfilename.img"))
self._compare(g, "boot-paravirt-disk-file", False)
def testBootParavirtDiskFileBlktapCapable(self):
@ -172,11 +172,11 @@ class TestXMLConfig(unittest.TestCase):
def testBootParavirtManyDisks(self):
g = utils.get_basic_paravirt_guest()
disk = utils.get_filedisk("/tmp/test2.img")
disk = utils.get_filedisk("/dev/default-pool/test2.img")
disk.driver_name = VirtualDisk.DRIVER_TAP
disk.driver_type = VirtualDisk.DRIVER_TAP_QCOW
g.add_device(utils.get_filedisk("/tmp/test1.img"))
g.add_device(utils.get_filedisk("/dev/default-pool/test1.img"))
g.add_device(disk)
g.add_device(utils.get_blkdisk())
self._compare(g, "boot-paravirt-many-disks", False)
@ -234,11 +234,11 @@ class TestXMLConfig(unittest.TestCase):
def testInstallParavirtManyDisks(self):
g = utils.get_basic_paravirt_guest()
disk = utils.get_filedisk("/tmp/test2.img")
disk = utils.get_filedisk("/dev/default-pool/test2.img")
disk.driver_name = VirtualDisk.DRIVER_TAP
disk.driver_type = VirtualDisk.DRIVER_TAP_QCOW
g.add_device(utils.get_filedisk("/tmp/test1.img"))
g.add_device(utils.get_filedisk("/dev/default-pool/test1.img"))
g.add_device(disk)
g.add_device(utils.get_blkdisk())
self._compare(g, "install-paravirt-many-disks", True)
@ -395,7 +395,7 @@ class TestXMLConfig(unittest.TestCase):
def testXMLEscaping(self):
g = utils.get_basic_fullyvirt_guest()
g.description = "foooo barrrr \n baz && snarf. '' \"\" @@$\n"
g.add_device(utils.get_filedisk("/tmp/ISO&'&s"))
g.add_device(utils.get_filedisk("/dev/default-pool/ISO&'&s"))
self._compare(g, "misc-xml-escaping", True)
# OS Type/Version configurations
@ -666,7 +666,7 @@ class TestXMLConfig(unittest.TestCase):
dev = VirtualParallelDevice(g.conn)
dev.type = "unix"
dev.source_path = "/tmp/foobar"
dev.source_path = "/dev/default-pool/foobar"
g.add_device(dev)
dev = VirtualSerialDevice(g.conn)
@ -789,7 +789,7 @@ class TestXMLConfig(unittest.TestCase):
cdev1.type = "null"
cdev2 = VirtualParallelDevice(g.conn)
cdev2.type = "unix"
cdev2.source_path = "/tmp/foobar"
cdev2.source_path = "/dev/default-pool/foobar"
cdev3 = VirtualChannelDevice(g.conn)
cdev3.type = "spicevmc"
g.add_device(cdev1)
@ -838,7 +838,7 @@ class TestXMLConfig(unittest.TestCase):
gdev3 = virtinst.VirtualGraphics(g.conn)
gdev3.type = "sdl"
gdev3.xauth = "/tmp/.Xauthority"
gdev3.xauth = "/dev/default-pool/.Xauthority"
gdev3.display = ":3.4"
gdev4 = virtinst.VirtualGraphics(g.conn)
gdev4.type = "spice"