openstack
/
nova
Code Issues Proposed changes

Reduce duplication and complexity in format_dom 

In this patchset, I reduced duplicated code lines and complexity
with using already existing methods in LibvirtConfigGuestSysinfo class,
format_dom() method. In this way, fewer if condition is used, which
reduces the complexity of the code.

Depends-On: I7baaf7f828c3b5ffa3d0bec7e80d348f7f9d1e45

Change-Id: I975fabf92121129aca46c0e56399638b3d14950f
This commit is contained in:
Gábor Antal 2015-10-07 20:13:48 +02:00
parent 2468784fcb
commit 87494fd70e
1 changed files with 21 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
nova/virt/libvirt/config.py
View File

@ -625,68 +625,45 @@ class LibvirtConfigGuestSysinfo(LibvirtConfigObject):
sysinfo.set("type", self.type)
bios = None
system = None
bios = etree.Element("bios")
system = etree.Element("system")
if self.bios_vendor is not None:
if bios is None:
bios = etree.Element("bios")
info = etree.Element("entry", name="vendor")
info.text = self.bios_vendor
bios.append(info)
bios.append(self._text_node("entry", self.bios_vendor,
name="vendor"))
if self.bios_version is not None:
if bios is None:
bios = etree.Element("bios")
info = etree.Element("entry", name="version")
info.text = self.bios_version
bios.append(info)
bios.append(self._text_node("entry", self.bios_version,
name="version"))
if self.system_manufacturer is not None:
if system is None:
system = etree.Element("system")
info = etree.Element("entry", name="manufacturer")
info.text = self.system_manufacturer
system.append(info)
system.append(self._text_node("entry", self.system_manufacturer,
name="manufacturer"))
if self.system_product is not None:
if system is None:
system = etree.Element("system")
info = etree.Element("entry", name="product")
info.text = self.system_product
system.append(info)
system.append(self._text_node("entry", self.system_product,
name="product"))
if self.system_version is not None:
if system is None:
system = etree.Element("system")
info = etree.Element("entry", name="version")
info.text = self.system_version
system.append(info)
system.append(self._text_node("entry", self.system_version,
name="version"))
if self.system_serial is not None:
if system is None:
system = etree.Element("system")
info = etree.Element("entry", name="serial")
info.text = self.system_serial
system.append(info)
system.append(self._text_node("entry", self.system_serial,
name="serial"))
if self.system_uuid is not None:
if system is None:
system = etree.Element("system")
info = etree.Element("entry", name="uuid")
info.text = self.system_uuid
system.append(info)
system.append(self._text_node("entry", self.system_uuid,
name="uuid"))
if self.system_family is not None:
if system is None:
system = etree.Element("system")
info = etree.Element("entry", name="family")
info.text = self.system_family
system.append(info)
system.append(self._text_node("entry", self.system_family,
name="family"))
if bios is not None:
if len(list(bios)) > 0:
sysinfo.append(bios)
if system is not None:
if len(list(system)) > 0:
sysinfo.append(system)
return sysinfo