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

VirtualDisk: Convert simple props to unified parse/get/set

Browse Source
This commit is contained in:
Cole Robinson 2013-07-12 15:26:31 -04:00
parent ce243314c0
commit fbf2d9ee40
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cli-test-xml/compare/many-devices.xml
View File

@ -30,10 +30,10 @@
<serial>WD-WMAP9A966149</serial> <serial>WD-WMAP9A966149</serial>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver error_policy="enospace"/>
<source file="/tmp/__virtinst_cli_new1.img"/> <source file="/tmp/__virtinst_cli_new1.img"/>
<target dev="hdb" bus="ide"/> <target dev="hdb" bus="ide"/>
<readonly/> <readonly/>
<driver error_policy="enospace"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">
<target dev="sda" bus="sata"/> <target dev="sda" bus="sata"/>
@ -117,10 +117,10 @@
<serial>WD-WMAP9A966149</serial> <serial>WD-WMAP9A966149</serial>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver error_policy="enospace"/>
<source file="/tmp/__virtinst_cli_new1.img"/> <source file="/tmp/__virtinst_cli_new1.img"/>
<target dev="hdb" bus="ide"/> <target dev="hdb" bus="ide"/>
<readonly/> <readonly/>
<driver error_policy="enospace"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">
<target dev="sda" bus="sata"/> <target dev="sda" bus="sata"/>

28
virtinst/VirtualDisk.py
View File

@ -576,8 +576,6 @@ class VirtualDisk(VirtualDevice):
self._driverName = driverName self._driverName = driverName
self._driverType = driverType self._driverType = driverType
self._driver_io = None self._driver_io = None
self._error_policy = None
self._serial = None
self._target = None self._target = None
self._validate = validate self._validate = validate
self._nomanaged = nomanaged self._nomanaged = nomanaged
@ -808,24 +806,8 @@ class VirtualDisk(VirtualDevice):
driver_io = _xml_property(_get_driver_io, _set_driver_io, driver_io = _xml_property(_get_driver_io, _set_driver_io,
xpath="./driver/@io") xpath="./driver/@io")
def _get_error_policy(self): error_policy = _xml_property(xpath="./driver/@error_policy")
return self._error_policy serial = _xml_property(xpath="./serial")
def _set_error_policy(self, val, validate=True):
if val is not None:
if val not in self.error_policies:
raise ValueError(_("Unknown error policy '%s'" % val))
self.__validate_wrapper("_error_policy", val, validate,
self.error_policy)
error_policy = _xml_property(_get_error_policy, _set_error_policy,
xpath="./driver/@error_policy")
def _get_serial(self):
return self._serial
def _set_serial(self, val, validate=True):
self.__validate_wrapper("_serial", val, validate,
self.serial)
serial = _xml_property(_get_serial, _set_serial,
xpath="./serial")
iotune_rbs = _xml_property(xpath="./iotune/read_bytes_sec", iotune_rbs = _xml_property(xpath="./iotune/read_bytes_sec",
get_converter=lambda s, x: int(x or 0), get_converter=lambda s, x: int(x or 0),
@ -1344,8 +1326,6 @@ class VirtualDisk(VirtualDevice):
drvxml += " type='%s'" % self.driver_type drvxml += " type='%s'" % self.driver_type
if not cache is None: if not cache is None:
drvxml += " cache='%s'" % cache drvxml += " cache='%s'" % cache
if not self.error_policy is None:
drvxml += " error_policy='%s'" % self.error_policy
if not iomode is None: if not iomode is None:
drvxml += " io='%s'" % iomode drvxml += " io='%s'" % iomode
@ -1376,10 +1356,6 @@ class VirtualDisk(VirtualDevice):
if ro: if ro:
ret += " <readonly/>\n" ret += " <readonly/>\n"
if self.serial:
ret += (" <serial>%s</serial>\n" %
util.xml_escape(self.serial))
addr = self.indent(self.address.get_xml_config(), 6) addr = self.indent(self.address.get_xml_config(), 6)
if addr: if addr:
ret += addr ret += addr