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

VirtualDisk: Convert path to new style XML property

Browse Source 
Due to the complexity here, we hide the XML bits under _xmlpath, and use
path to cover the internal state integration.
This commit is contained in:
Cole Robinson 2013-07-14 18:14:55 -04:00
parent 13d8a4dae5
commit c7ca9c88e3
1 changed files with 44 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
virtinst/VirtualDisk.py
View File

@ -397,16 +397,17 @@ class VirtualDisk(VirtualDevice):
VirtualDevice.__init__(self, conn, parsexml, parsexmlnode)
self._storage_backend = diskbackend.StorageBackend(self.conn,
None, None, None)
self._xmlpath,
None, None)
self._storage_creator = None
self.nomanaged = False
self.transient = False
##########################
# Complex XML properties #
##########################
#############################
# Public property-esque API #
#############################
def _get_path(self):
if self._storage_creator:
@ -418,24 +419,26 @@ class VirtualDisk(VirtualDevice):
"has been set.")
self._change_backend(val, None)
self._refresh_backend_settings()
def _xml_get_xpath(self):
xpath = None
ret = "./source/@file"
for prop in _TARGET_PROPS:
xpath = "./source/@" + prop
if self._xml_ctx.xpathEval(xpath):
ret = xpath
break
return ret
def _xml_set_xpath(self):
return "./source/@" + self.disk_type_to_target_prop(self.type)
path = XMLProperty(_get_path, _set_path, name="disk path",
xml_get_xpath=_xml_get_xpath,
xml_set_xpath=_xml_set_xpath,
clear_first=["./source/@" + target for target in
_TARGET_PROPS])
path = property(_get_path, _set_path)
def get_sparse(self):
if self._storage_creator:
return self._storage_creator.get_sparse()
return None
def get_vol_object(self):
return self._storage_backend.get_vol_object()
def get_vol_install(self):
if not self._storage_creator:
return None
return self._storage_creator.get_vol_install()
def get_size(self):
if self._storage_creator:
return self._storage_creator.get_size()
return self._storage_backend.get_size()
#############################
# Internal defaults helpers #
@ -471,9 +474,26 @@ class VirtualDisk(VirtualDevice):
return _qemu_sanitize_drvtype(self.type, drvtype)
#########################
# Simple XML properties #
#########################
##################
# XML properties #
##################
def _xml_get_xpath(self):
xpath = None
ret = "./source/@file"
for prop in _TARGET_PROPS:
xpath = "./source/@" + prop
if self._xml_ctx.xpathEval(xpath):
ret = xpath
break
return ret
def _xml_set_xpath(self):
return "./source/@" + self.disk_type_to_target_prop(self.type)
_xmlpath = XMLProperty(name="disk path",
xml_get_xpath=_xml_get_xpath,
xml_set_xpath=_xml_set_xpath,
clear_first=["./source/@" + target for target in
_TARGET_PROPS])
device = XMLProperty(xpath="./@device",
default_cb=lambda s: s.DEVICE_DISK)
@ -503,28 +523,6 @@ class VirtualDisk(VirtualDevice):
iotune_wis = XMLProperty(xpath="./iotune/write_iops_sec", is_int=True)
#############################
# Public property-esque API #
#############################
def get_sparse(self):
if self._storage_creator:
return self._storage_creator.get_sparse()
return None
def get_vol_object(self):
return self._storage_backend.get_vol_object()
def get_vol_install(self):
if not self._storage_creator:
return None
return self._storage_creator.get_vol_install()
def get_size(self):
if self._storage_creator:
return self._storage_creator.get_size()
return self._storage_backend.get_size()
#################################
# Validation assistance methods #
#################################
@ -594,6 +592,7 @@ class VirtualDisk(VirtualDevice):
self.refresh_xml_prop("type")
self.refresh_xml_prop("driver_name")
self.refresh_xml_prop("driver_type")
self._xmlpath = self.path
def __managed_storage(self):
"""
@ -710,16 +709,7 @@ class VirtualDisk(VirtualDevice):
def _get_xml_config(self):
typeattr = self.type
if self.type == VirtualDisk.TYPE_BLOCK:
typeattr = 'dev'
path = self.path
if path:
path = util.xml_escape(path)
ret = " <disk>\n"
if path is not None:
ret += " <source %s='%s'/>\n" % (typeattr, path)
addr = self.indent(self.address.get_xml_config(), 6)
if addr:
ret += addr