diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml index 713fc94d..8bf23451 100644 --- a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml +++ b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml @@ -11,6 +11,9 @@ + + /virtualmachines/production + hvm /usr/share/OVMF/OVMF_CODE.fd @@ -27,9 +30,6 @@ restart - - /virtualmachines/production - diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml index f2e00e91..d14d93b9 100644 --- a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml +++ b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml @@ -29,6 +29,34 @@ + + /virtualmachines/production + + + + Acme LLC + 1.2.3 + 01/01/1970 + 10.22 + + + Acme Inc. + Computer + 3.2.1 + 123456789 + 00000000-1111-2222-3333-444444444444 + abc-123 + Server + + + Acme Corp. + Motherboard + A01 + 1234-5678 + Tag + Chassis + + hvm /foo/bar @@ -76,9 +104,6 @@ destroy destroy preserve - - /virtualmachines/production - @@ -123,31 +148,6 @@ - - - Acme LLC - 1.2.3 - 01/01/1970 - 10.22 - - - Acme Inc. - Computer - 3.2.1 - 123456789 - 00000000-1111-2222-3333-444444444444 - abc-123 - Server - - - Acme Corp. - Motherboard - A01 - 1234-5678 - Tag - Chassis - - ignore @@ -181,6 +181,34 @@ + + /virtualmachines/production + + + + Acme LLC + 1.2.3 + 01/01/1970 + 10.22 + + + Acme Inc. + Computer + 3.2.1 + 123456789 + 00000000-1111-2222-3333-444444444444 + abc-123 + Server + + + Acme Corp. + Motherboard + A01 + 1234-5678 + Tag + Chassis + + hvm /foo/bar @@ -228,9 +256,6 @@ destroy restart preserve - - /virtualmachines/production - @@ -275,30 +300,5 @@ - - - Acme LLC - 1.2.3 - 01/01/1970 - 10.22 - - - Acme Inc. - Computer - 3.2.1 - 123456789 - 00000000-1111-2222-3333-444444444444 - abc-123 - Server - - - Acme Corp. - Motherboard - A01 - 1234-5678 - Tag - Chassis - - ignore diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml index 8b27b18f..870a4570 100644 --- a/tests/xmlparse-xml/change-guest-out.xml +++ b/tests/xmlparse-xml/change-guest-out.xml @@ -103,12 +103,12 @@ + + /virtualmachines/production + pygrub - - /virtualmachines/production - diff --git a/virtinst/guest.py b/virtinst/guest.py index dfc8ea69..f9525a33 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -105,9 +105,9 @@ class Guest(XMLBuilder): _XML_PROP_ORDER = ["type", "name", "uuid", "title", "description", "maxmemory", "memory", "blkiotune", "memtune", "memoryBacking", "vcpus", "curvcpus", "vcpu_placement", "cpuset", - "numatune", "bootloader", "os", "idmap", + "numatune", "resource", "sysinfo", "bootloader", "os", "idmap", "features", "cpu", "clock", "on_poweroff", "on_reboot", "on_crash", - "resource", "pm", "emulator", "_devices", "seclabels", "sysinfo"] + "pm", "emulator", "_devices", "seclabels"] def __init__(self, *args, **kwargs): XMLBuilder.__init__(self, *args, **kwargs)