qemuxml2xmloutdata: Turn net-mtu.xml into a symlink

There's nothing specific about net-mtu test. In fact, if device
addresses are filled in (and some elements reordered), we get the
same XML. Make those changes to the input XML and turn the output
XML to be a symlink.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/qemuxml2argvdata/net-mtu.xml b/tests/qemuxml2argvdata/net-mtu.xml
index 99258b97fac1cf4e049ffa76be46c972a217721e..900548b4652c3aa62fbaa0d03002eb08d2b16d8d 100644 (file)
--- a/tests/qemuxml2argvdata/net-mtu.xml
+++ b/tests/qemuxml2argvdata/net-mtu.xml
@@ -29,32 +29,43 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'/>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
     <controller type='virtio-serial' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </controller>
-    <controller type='ide' index='0'/>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
-      <source network='default'/>
       <mac address='52:54:00:e5:48:58'/>
+      <source network='default'/>
       <model type='virtio'/>
       <mtu size='1500'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </interface>
     <interface type='network'>
-      <source network='default'/>
       <mac address='52:54:00:e5:48:59'/>
+      <source network='default'/>
       <model type='virtio'/>
       <mtu size='9000'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </interface>
     <serial type='pty'>
-      <target port='0'/>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
     </serial>
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <memballoon model='virtio'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </memballoon>
   </devices>
 </domain>

diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.xml
deleted file mode 100644 (file)
index 900548b4652c3aa62fbaa0d03002eb08d2b16d8d..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/net-mtu.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<domain type='qemu'>
-  <name>test</name>
-  <uuid>15d091de-0181-456b-9554-e4382dc1f1ab</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='cdrom'/>
-    <boot dev='hd'/>
-    <bootmenu enable='yes'/>
-  </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' event_idx='on'/>
-      <source file='/var/lib/libvirt/images/f14.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='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </controller>
-    <controller type='ide' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <interface type='network'>
-      <mac address='52:54:00:e5:48:58'/>
-      <source network='default'/>
-      <model type='virtio'/>
-      <mtu size='1500'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </interface>
-    <interface type='network'>
-      <mac address='52:54:00:e5:48:59'/>
-      <source network='default'/>
-      <model type='virtio'/>
-      <mtu size='9000'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.xml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..a4a2e06bc65a19d41d606a6de7931fa0ede31f36
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-mtu.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/net-mtu.xml
\ No newline at end of file