openstack/fuel-devops
Code Issues Proposed changes

Fix xml setter in Snapshot class

Browse Source 
Check for <cpu> and 'mode' while modifying snapshot xml

Change-Id: I600066caf3c11be48bc74b91f498b5a2176305f6
Closes-Bug:#1539985
This commit is contained in:
Dennis Dmitriev
2016-01-30 22:07:00 +02:00
parent 09b4eaad99
commit aa08fbb433
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
devops/driver/libvirt/libvirt_driver.py
View File

@@ -45,17 +45,19 @@ class Snapshot(object):
@_xml.setter
def _xml(self, xml_content):
snapshot_xmltree = ET.fromstring(xml_content)
cpu_mode = snapshot_xmltree.findall('./domain/cpu')[0].get('mode')
# Get cpu model from domain definition as it is not available
# in snapshot XML for host-passthrough cpu mode
if cpu_mode == 'host-passthrough':
domain_xml = self._domain.XMLDesc(
libvirt.VIR_DOMAIN_XML_UPDATE_CPU)
domain_xmltree = ET.fromstring(domain_xml)
cpu_element = domain_xmltree.find('./cpu')
domain_element = snapshot_xmltree.findall('./domain')[0]
domain_element.remove(domain_element.findall('./cpu')[0])
domain_element.append(cpu_element)
cpu = snapshot_xmltree.findall('./domain/cpu')
if cpu and 'mode' in cpu[0].attrib:
cpu_mode = cpu[0].get('mode')
# Get cpu model from domain definition as it is not available
# in snapshot XML for host-passthrough cpu mode
if cpu_mode == 'host-passthrough':
domain_xml = self._domain.XMLDesc(
libvirt.VIR_DOMAIN_XML_UPDATE_CPU)
domain_xmltree = ET.fromstring(domain_xml)
cpu_element = domain_xmltree.find('./cpu')
domain_element = snapshot_xmltree.findall('./domain')[0]
domain_element.remove(domain_element.findall('./cpu')[0])
domain_element.append(cpu_element)
self._xml_content = ET.tostring(snapshot_xmltree)
@property