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

virtconv: Don't implicitly depend on dict hash order

Browse Source
This commit is contained in:
Cole Robinson 2017-10-20 16:06:48 -04:00
parent b8fa0c6b67
commit d2648d81cc
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
View File

@ -6,7 +6,6 @@
<vcpu>1</vcpu> <vcpu>1</vcpu>
<os> <os>
<type arch="x86_64">hvm</type> <type arch="x86_64">hvm</type>
<boot dev="cdrom"/>
<boot dev="hd"/> <boot dev="hd"/>
</os> </os>
<features> <features>
@ -28,15 +27,15 @@
</pm> </pm>
<devices> <devices>
<emulator>/usr/bin/qemu-kvm</emulator> <emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="cdrom">
<driver type="raw"/>
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source file="/var/lib/libvirt/images/MS-DOS"/> <source file="/var/lib/libvirt/images/MS-DOS"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
<driver type="raw"/>
<target dev="hdb" bus="ide"/> <target dev="hdb" bus="ide"/>
<readonly/>
</disk> </disk>
<controller type="usb" index="0" model="ich9-ehci1"/> <controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1"> <controller type="usb" index="0" model="ich9-uhci1">

9
tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
View File

@ -6,7 +6,6 @@
<vcpu>2</vcpu> <vcpu>2</vcpu>
<os> <os>
<type arch="x86_64">hvm</type> <type arch="x86_64">hvm</type>
<boot dev="cdrom"/>
<boot dev="hd"/> <boot dev="hd"/>
</os> </os>
<features> <features>
@ -28,15 +27,15 @@
</pm> </pm>
<devices> <devices>
<emulator>/usr/bin/qemu-kvm</emulator> <emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="cdrom">
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source file="/var/lib/libvirt/images/ESX4.0-rhel4u8-32b-flat"/> <source file="/var/lib/libvirt/images/ESX4.0-rhel4u8-32b-flat"/>
<target dev="sda" bus="scsi"/> <target dev="sda" bus="scsi"/>
</disk> </disk>
<disk type="file" device="cdrom">
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/> <controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1"> <controller type="usb" index="0" model="ich9-uhci1">
<master startport="0"/> <master startport="0"/>

3
virtconv/vmx.py
View File

@ -19,6 +19,7 @@
# MA 02110-1301 USA. # MA 02110-1301 USA.
# #
import collections
import logging import logging
import os import os
import re import re
@ -88,7 +89,7 @@ class _VMXFile(object):
(len(self.lines) + 1, line.strip(), e)) (len(self.lines) + 1, line.strip(), e))
def pairs(self): def pairs(self):
ret = {} ret = collections.OrderedDict()
for line in self.lines: for line in self.lines:
if line.pair: if line.pair:
ret[line.pair[0]] = line.pair[1] ret[line.pair[0]] = line.pair[1]