[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH v4 7/7] bandwidth: Add domain schema test suite



On 07/22/2011 10:07 AM, Michal Privoznik wrote:
---
  tests/domainschemadata/domain-bandwidth.xml |   72 +++++++++++++++++++++++++++
  1 files changed, 72 insertions(+), 0 deletions(-)
  create mode 100644 tests/domainschemadata/domain-bandwidth.xml

Instead of putting this file in the domainschemadata directory, you should put it in the qemuxml2argvdata directory (named as, e.g. "qemuxml2argv-net-bandwidth.xml", then add the line:

   DO_TEST("net-bandwidth");

to qemuxml2xmltest.c.

Since all files in qemuxml2argv are run through domainschematest, you'll still get the test coverage you've got now, but will have the added advantage that it goes through the parse->format->compare-to-original (xml2xml) test as well. (it won't try to do the argv test (which we don't want in this case) unless you also add it to the list in qemuxml2argvtest.c)

ACK if you move the file and add it to the xml2xml tests in qemuxml2xmltest.c.



diff --git a/tests/domainschemadata/domain-bandwidth.xml b/tests/domainschemadata/domain-bandwidth.xml
new file mode 100644
index 0000000..852c97b
--- /dev/null
+++ b/tests/domainschemadata/domain-bandwidth.xml
@@ -0,0 +1,72 @@
+<domain type='kvm'>
+<name>f14-60</name>
+<uuid>38644c45-5227-a936-3b38-bc4f72c355bb</uuid>
+<memory>1048576</memory>
+<currentMemory>1048576</currentMemory>
+<vcpu>2</vcpu>
+<os>
+<type arch='x86_64' machine='pc-0.13'>hvm</type>
+<boot dev='cdrom'/>
+<boot dev='hd'/>
+<bootmenu enable='yes'/>
+</os>
+<features>
+<acpi/>
+<apic/>
+<pae/>
+</features>
+<clock offset='utc'/>
+<on_poweroff>destroy</on_poweroff>
+<on_reboot>restart</on_reboot>
+<on_crash>restart</on_crash>
+<devices>
+<emulator>/usr/bin/qemu-kvm</emulator>
+<disk type='file' device='disk'>
+<driver name='qemu' type='qcow2'/>
+<source file='/var/lib/libvirt/images/f14-6.img'/>
+<target dev='vda' bus='virtio'/>
+<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+</disk>
+<disk type='file' device='cdrom'>
+<driver name='qemu' type='raw'/>
+<source file='/home/zippy/tmp/Fedora-14-x86_64-Live-KDE.iso'/>
+<target dev='hdc' bus='ide'/>
+<readonly/>
+<address type='drive' controller='0' bus='1' unit='0'/>
+</disk>
+<controller type='ide' index='0'>
+<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+</controller>
+<controller type='virtio-serial' index='0'>
+<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
+</controller>
+<interface type='network'>
+<mac address='52:54:00:24:a5:9f'/>
+<source network='default'/>
+<bandwidth>
+<inbound average='1000' peak='4000' burst='1024'/>
+<outbound average='128' peak='256' burst='32768'/>
+</bandwidth>
+<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
+</interface>
+<serial type='pty'>
+<target port='0'/>
+</serial>
+<console type='pty'>
+<target type='serial' port='0'/>
+</console>
+<input type='tablet' bus='usb'/>
+<input type='mouse' bus='ps2'/>
+<graphics type='vnc' port='-1' autoport='yes'/>
+<sound model='ac97'>
+<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+</sound>
+<video>
+<model type='vga' vram='9216' heads='1'/>
+<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+</video>
+<memballoon model='virtio'>
+<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+</memballoon>
+</devices>
+</domain>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]