mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 18:55:27 -06:00
VirtualFilesystem: Convert to new style XML props
This commit is contained in:
Cole Robinson
parent
dc58d48a33
commit
9c92d8e092
@ -332,8 +332,8 @@ class vmmAddHardware(vmmGObjectUI):
|
||||
simple_store_set("fs-type-combo",
|
||||
[VirtualFilesystem.TYPE_MOUNT,
|
||||
VirtualFilesystem.TYPE_TEMPLATE])
|
||||
simple_store_set("fs-mode-combo", VirtualFilesystem.MOUNT_MODES)
|
||||
simple_store_set("fs-driver-combo", VirtualFilesystem.DRIVER_TYPES)
|
||||
simple_store_set("fs-mode-combo", VirtualFilesystem.MODES)
|
||||
simple_store_set("fs-driver-combo", VirtualFilesystem.DRIVERS)
|
||||
simple_store_set("fs-wrpolicy-combo", VirtualFilesystem.WRPOLICIES)
|
||||
self.show_pair_combo("fs-type", self.conn.is_openvz())
|
||||
self.show_check_button("fs-readonly", self.conn.is_qemu())
|
||||
|
||||
@ -24,7 +24,6 @@ from virtinst.xmlbuilder import XMLProperty
|
||||
|
||||
|
||||
class VirtualFilesystem(VirtualDevice):
|
||||
|
||||
_virtual_device_type = VirtualDevice.VIRTUAL_DEV_FILESYSTEM
|
||||
|
||||
_target_props = ["dir", "name", "file", "dev"]
|
||||
@ -40,7 +39,7 @@ class VirtualFilesystem(VirtualDevice):
|
||||
MODE_MAPPED = "mapped"
|
||||
MODE_SQUASH = "squash"
|
||||
MODE_DEFAULT = "default"
|
||||
MOUNT_MODES = [MODE_PASSTHROUGH, MODE_MAPPED, MODE_SQUASH, MODE_DEFAULT]
|
||||
MODES = [MODE_PASSTHROUGH, MODE_MAPPED, MODE_SQUASH, MODE_DEFAULT]
|
||||
|
||||
WRPOLICY_IMM = "immediate"
|
||||
WRPOLICY_DEFAULT = "default"
|
||||
@ -50,7 +49,7 @@ class VirtualFilesystem(VirtualDevice):
|
||||
DRIVER_HANDLE = "handle"
|
||||
DRIVER_PROXY = "proxy"
|
||||
DRIVER_DEFAULT = "default"
|
||||
DRIVER_TYPES = [DRIVER_PATH, DRIVER_HANDLE, DRIVER_PROXY, DRIVER_DEFAULT]
|
||||
DRIVERS = [DRIVER_PATH, DRIVER_HANDLE, DRIVER_PROXY, DRIVER_DEFAULT]
|
||||
|
||||
@staticmethod
|
||||
def type_to_source_prop(fs_type):
|
||||
@ -70,70 +69,23 @@ class VirtualFilesystem(VirtualDevice):
|
||||
return "dev"
|
||||
return "dir"
|
||||
|
||||
def __init__(self, conn, parsexml=None, parsexmlnode=None):
|
||||
VirtualDevice.__init__(self, conn, parsexml, parsexmlnode)
|
||||
|
||||
self._type = None
|
||||
self._mode = None
|
||||
self._driver = None
|
||||
self._target = None
|
||||
self._source = None
|
||||
self._readonly = None
|
||||
self._wrpolicy = None
|
||||
type = XMLProperty(xpath="./@type",
|
||||
default_cb=lambda s: None,
|
||||
default_name=TYPE_DEFAULT)
|
||||
mode = XMLProperty(xpath="./@accessmode",
|
||||
default_cb=lambda s: None,
|
||||
default_name=MODE_DEFAULT)
|
||||
wrpolicy = XMLProperty(xpath="./driver/@wrpolicy",
|
||||
default_cb=lambda s: None,
|
||||
default_name=WRPOLICY_DEFAULT)
|
||||
driver = XMLProperty(xpath="./driver/@type",
|
||||
default_cb=lambda s: None,
|
||||
default_name=DRIVER_DEFAULT)
|
||||
|
||||
if self._is_parse():
|
||||
return
|
||||
readonly = XMLProperty(xpath="./readonly", is_bool=True)
|
||||
|
||||
self.mode = self.MODE_DEFAULT
|
||||
self.type = self.TYPE_DEFAULT
|
||||
self.driver = self.DRIVER_DEFAULT
|
||||
self.wrpolicy = self.WRPOLICY_DEFAULT
|
||||
|
||||
def _get_type(self):
|
||||
return self._type
|
||||
def _set_type(self, val):
|
||||
if val is not None and not self.TYPES.count(val):
|
||||
raise ValueError(_("Unsupported filesystem type '%s'" % val))
|
||||
self._type = val
|
||||
type = XMLProperty(_get_type, _set_type, xpath="./@type")
|
||||
|
||||
def _get_mode(self):
|
||||
return self._mode
|
||||
def _set_mode(self, val):
|
||||
if val is not None and not self.MOUNT_MODES.count(val):
|
||||
raise ValueError(_("Unsupported filesystem mode '%s'" % val))
|
||||
self._mode = val
|
||||
mode = XMLProperty(_get_mode, _set_mode, xpath="./@accessmode")
|
||||
|
||||
def _get_wrpolicy(self):
|
||||
return self._wrpolicy
|
||||
def _set_wrpolicy(self, val):
|
||||
if val is not None and not self.WRPOLICIES.count(val):
|
||||
raise ValueError(_("Unsupported filesystem write policy '%s'" % val))
|
||||
self._wrpolicy = val
|
||||
wrpolicy = XMLProperty(_get_wrpolicy, _set_wrpolicy, xpath="./driver/@wrpolicy")
|
||||
|
||||
def _get_readonly(self):
|
||||
return self._readonly
|
||||
def _set_readonly(self, val):
|
||||
self._readonly = val
|
||||
readonly = XMLProperty(_get_readonly, _set_readonly,
|
||||
xpath="./readonly", is_bool=True)
|
||||
|
||||
def _get_driver(self):
|
||||
return self._driver
|
||||
def _set_driver(self, val):
|
||||
if val is not None and not self.DRIVER_TYPES.count(val):
|
||||
raise ValueError(_("Unsupported filesystem driver '%s'" % val))
|
||||
self._driver = val
|
||||
driver = XMLProperty(_get_driver, _set_driver, xpath="./driver/@type")
|
||||
|
||||
def _get_source(self):
|
||||
return self._source
|
||||
def _set_source(self, val):
|
||||
if self.type != self.TYPE_TEMPLATE:
|
||||
val = os.path.abspath(val)
|
||||
self._source = val
|
||||
def _xml_get_source_xpath(self):
|
||||
xpath = None
|
||||
ret = "./source/@dir"
|
||||
@ -146,13 +98,11 @@ class VirtualFilesystem(VirtualDevice):
|
||||
def _xml_set_source_xpath(self):
|
||||
ret = "./source/@" + self.type_to_source_prop(self.type)
|
||||
return ret
|
||||
source = XMLProperty(_get_source, _set_source, name="filesystem source",
|
||||
xml_get_xpath=_xml_get_source_xpath,
|
||||
xml_set_xpath=_xml_set_source_xpath)
|
||||
source = XMLProperty(name="filesystem source",
|
||||
xml_get_xpath=_xml_get_source_xpath,
|
||||
xml_set_xpath=_xml_set_source_xpath)
|
||||
|
||||
def _get_target(self):
|
||||
return self._target
|
||||
def _set_target(self, val):
|
||||
def _validate_set_target(self, val):
|
||||
# In case of qemu for default fs type (mount) target is not
|
||||
# actually a directory, it is merely a arbitrary string tag
|
||||
# that is exported to the guest as a hint for where to mount
|
||||
@ -163,56 +113,6 @@ class VirtualFilesystem(VirtualDevice):
|
||||
elif not os.path.isabs(val):
|
||||
raise ValueError(_("Filesystem target '%s' must be an absolute "
|
||||
"path") % val)
|
||||
self._target = val
|
||||
target = XMLProperty(_get_target, _set_target, xpath="./target/@dir")
|
||||
|
||||
|
||||
def _get_xml_config(self):
|
||||
mode = self.mode
|
||||
ftype = self.type
|
||||
driver = self.driver
|
||||
source = self.source
|
||||
target = self.target
|
||||
readonly = self.readonly
|
||||
wrpolicy = self.wrpolicy
|
||||
|
||||
if mode == self.MODE_DEFAULT:
|
||||
mode = None
|
||||
if ftype == self.TYPE_DEFAULT:
|
||||
ftype = None
|
||||
if driver == self.DRIVER_DEFAULT:
|
||||
driver = None
|
||||
wrpolicy = None
|
||||
if wrpolicy == self.WRPOLICY_DEFAULT:
|
||||
wrpolicy = None
|
||||
|
||||
if not source or not target:
|
||||
raise ValueError(
|
||||
_("A filesystem source and target must be specified"))
|
||||
|
||||
fsxml = " <filesystem"
|
||||
if ftype:
|
||||
fsxml += " type='%s'" % ftype
|
||||
if mode:
|
||||
fsxml += " accessmode='%s'" % mode
|
||||
fsxml += ">\n"
|
||||
|
||||
if driver:
|
||||
if not wrpolicy:
|
||||
fsxml += " <driver type='%s'/>\n" % driver
|
||||
else:
|
||||
fsxml += " <driver type='%s' wrpolicy='%s' />\n" % (
|
||||
driver,
|
||||
wrpolicy)
|
||||
|
||||
fsxml += " <source %s='%s'/>\n" % (
|
||||
self.type_to_source_prop(ftype),
|
||||
source)
|
||||
fsxml += " <target dir='%s'/>\n" % target
|
||||
|
||||
if readonly:
|
||||
fsxml += " <readonly/>\n"
|
||||
|
||||
fsxml += " </filesystem>"
|
||||
|
||||
return fsxml
|
||||
return val
|
||||
target = XMLProperty(xpath="./target/@dir",
|
||||
set_converter=_validate_set_target)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user