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

fsdetails: Make test driver act identical to qemu

Browse Source
This commit is contained in:
Cole Robinson 2014-03-06 11:41:34 -05:00
parent b078ba8c3d
commit 7d62662ec9
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
virtManager/fsdetails.py
View File

@ -103,10 +103,12 @@ class vmmFSDetails(vmmGObjectUI):
# Filesystem widgets # Filesystem widgets
if self.conn.is_openvz(): if self.conn.is_openvz():
simple_store_set("fs-type-combo", [VirtualFilesystem.TYPE_MOUNT, simple_store_set("fs-type-combo",
[VirtualFilesystem.TYPE_MOUNT,
VirtualFilesystem.TYPE_TEMPLATE]) VirtualFilesystem.TYPE_TEMPLATE])
elif self.conn.is_lxc(): elif self.conn.is_lxc():
simple_store_set("fs-type-combo", [VirtualFilesystem.TYPE_MOUNT, simple_store_set("fs-type-combo",
[VirtualFilesystem.TYPE_MOUNT,
VirtualFilesystem.TYPE_FILE, VirtualFilesystem.TYPE_FILE,
VirtualFilesystem.TYPE_BLOCK, VirtualFilesystem.TYPE_BLOCK,
VirtualFilesystem.TYPE_RAM]) VirtualFilesystem.TYPE_RAM])
@ -116,20 +118,27 @@ class vmmFSDetails(vmmGObjectUI):
simple_store_set("fs-mode-combo", VirtualFilesystem.MODES) simple_store_set("fs-mode-combo", VirtualFilesystem.MODES)
if self.conn.is_qemu() or self.conn.is_test_conn(): if self.conn.is_qemu() or self.conn.is_test_conn():
simple_store_set("fs-driver-combo", [VirtualFilesystem.DRIVER_PATH, simple_store_set("fs-driver-combo",
[VirtualFilesystem.DRIVER_PATH,
VirtualFilesystem.DRIVER_HANDLE, VirtualFilesystem.DRIVER_HANDLE,
VirtualFilesystem.DRIVER_DEFAULT]) VirtualFilesystem.DRIVER_DEFAULT])
elif self.conn.is_lxc(): elif self.conn.is_lxc():
simple_store_set("fs-driver-combo", [VirtualFilesystem.DRIVER_LOOP, simple_store_set("fs-driver-combo",
[VirtualFilesystem.DRIVER_LOOP,
VirtualFilesystem.DRIVER_NBD, VirtualFilesystem.DRIVER_NBD,
VirtualFilesystem.DRIVER_DEFAULT]) VirtualFilesystem.DRIVER_DEFAULT])
else: else:
simple_store_set("fs-driver-combo", [VirtualFilesystem.DRIVER_DEFAULT]) simple_store_set("fs-driver-combo",
simple_store_set("fs-format-combo", StorageVolume.ALL_FORMATS, capitalize=False) [VirtualFilesystem.DRIVER_DEFAULT])
simple_store_set("fs-format-combo",
StorageVolume.ALL_FORMATS, capitalize=False)
simple_store_set("fs-wrpolicy-combo", VirtualFilesystem.WRPOLICIES) simple_store_set("fs-wrpolicy-combo", VirtualFilesystem.WRPOLICIES)
self.show_pair_combo("fs-type", self.conn.is_openvz() or self.conn.is_lxc()) self.show_pair_combo("fs-type",
self.conn.is_openvz() or self.conn.is_lxc())
self.show_check_button("fs-readonly", self.show_check_button("fs-readonly",
self.conn.is_qemu() or self.conn.is_lxc()) self.conn.is_qemu() or
self.conn.is_test_conn() or
self.conn.is_lxc())
def reset_state(self): def reset_state(self):
self.widget("fs-type-combo").set_active(0) self.widget("fs-type-combo").set_active(0)
@ -185,7 +194,8 @@ class vmmFSDetails(vmmGObjectUI):
self.widget("fs-target").set_text(dev.target or "") self.widget("fs-target").set_text(dev.target or "")
self.widget("fs-readonly").set_active(dev.readonly) self.widget("fs-readonly").set_active(dev.readonly)
self.show_pair_combo("fs-type", self.conn.is_openvz() or self.conn.is_lxc()) self.show_pair_combo("fs-type",
self.conn.is_openvz() or self.conn.is_lxc())
def set_config_ram_usage(self, usage, units): def set_config_ram_usage(self, usage, units):
value = int(usage) value = int(usage)
@ -237,8 +247,10 @@ class vmmFSDetails(vmmGObjectUI):
show_wrpol) show_wrpol)
show_ram_source = fstype == VirtualFilesystem.TYPE_RAM show_ram_source = fstype == VirtualFilesystem.TYPE_RAM
uiutil.set_grid_row_visible(self.widget("fs-ram-source-box"), show_ram_source) uiutil.set_grid_row_visible(
uiutil.set_grid_row_visible(self.widget("fs-source-box"), not show_ram_source) self.widget("fs-ram-source-box"), show_ram_source)
uiutil.set_grid_row_visible(
self.widget("fs-source-box"), not show_ram_source)
show_format = bool( show_format = bool(
fsdriver == VirtualFilesystem.DRIVER_NBD) fsdriver == VirtualFilesystem.DRIVER_NBD)
@ -247,13 +259,15 @@ class vmmFSDetails(vmmGObjectUI):
show_mode_combo = False show_mode_combo = False
show_driver_combo = False show_driver_combo = False
show_wrpolicy_combo = self.conn.is_qemu() show_wrpolicy_combo = self.conn.is_qemu() or self.conn.is_test_conn()
if fstype == VirtualFilesystem.TYPE_TEMPLATE: if fstype == VirtualFilesystem.TYPE_TEMPLATE:
source_text = _("Te_mplate:") source_text = _("Te_mplate:")
else: else:
source_text = _("_Source path:") source_text = _("_Source path:")
show_mode_combo = self.conn.is_qemu() show_mode_combo = self.conn.is_qemu() or self.conn.is_test_conn()
show_driver_combo = self.conn.is_qemu() or self.conn.is_lxc() show_driver_combo = (self.conn.is_qemu() or
self.conn.is_lxc() or
self.conn.is_test_conn())
self.widget("fs-source-title").set_text(source_text) self.widget("fs-source-title").set_text(source_text)
self.widget("fs-source-title").set_use_underline(True) self.widget("fs-source-title").set_use_underline(True)
@ -281,7 +295,8 @@ class vmmFSDetails(vmmGObjectUI):
if not source and fstype != VirtualFilesystem.TYPE_RAM: if not source and fstype != VirtualFilesystem.TYPE_RAM:
return self.err.val_err(_("A filesystem source must be specified")) return self.err.val_err(_("A filesystem source must be specified"))
elif usage == 0 and fstype == VirtualFilesystem.TYPE_RAM: elif usage == 0 and fstype == VirtualFilesystem.TYPE_RAM:
return self.err.val_err(_("A RAM filesystem usage must be specified")) return self.err.val_err(
_("A RAM filesystem usage must be specified"))
if not target: if not target:
return self.err.val_err(_("A filesystem target must be specified")) return self.err.val_err(_("A filesystem target must be specified"))