shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-26 10:03:54 +03:00
Code Issues Projects Releases Wiki Activity

xmlbuilder: Fix adding devices with child properties

Browse Source 
And test it
This commit is contained in:
Cole Robinson 2014-01-27 19:54:41 -05:00
parent 37e1242bf4
commit dde460e399
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/xmlparse-xml/add-devices-out.xml
View File

@ -42,6 +42,7 @@
<interface type="network">
<source network="default"/>
<mac address="1A:2A:3A:4A:5A:6A"/>
<address type="spapr-vio"/>
</interface>
<watchdog model="i6300esb" action="reset"/>
</devices>

1
tests/xmlparse.py
View File

@ -823,6 +823,7 @@ class XMLParseTest(unittest.TestCase):
adddev.type = "network"
adddev.source = "default"
adddev.macaddr = "1A:2A:3A:4A:5A:6A"
adddev.address.set_addrstr("spapr-vio")
guest.add_device(virtinst.VirtualWatchdog(conn))

13
virtinst/xmlbuilder.py
View File

@ -943,6 +943,15 @@ class XMLBuilder(object):
"Didn't find child property for child_class=%s" %
child_class)
def _parse_with_children(self, *args, **kwargs):
"""
Set new backing XML objects in ourselves and all our child props
"""
self._xmlstate._parse(*args, **kwargs)
for propname in self._all_child_props():
for p in util.listify(getattr(self, propname, [])):
p._xmlstate._parse(None, self._xmlstate.xml_node)
def _add_child(self, obj):
"""
Insert the passed XMLBuilder object into our XML document. The
@ -958,7 +967,7 @@ class XMLBuilder(object):
indent = 2 * obj.get_root_xpath().count("/")
newnode = libxml2.parseDoc(util.xml_indent(xml, indent)).children
_build_xpath_node(self._xmlstate.xml_ctx, use_xpath, newnode)
obj._xmlstate._parse(None, self._xmlstate.xml_node)
obj._parse_with_children(None, self._xmlstate.xml_node)
def _remove_child(self, obj):
"""
@ -972,7 +981,7 @@ class XMLBuilder(object):
xml = obj.get_xml_config()
obj._set_parent_xpath(None)
obj._set_relative_object_xpath(None)
obj._xmlstate._parse(xml, None)
obj._parse_with_children(xml, None)
_remove_xpath_node(self._xmlstate.xml_ctx, xpath, dofree=False)
self._set_child_xpaths()