openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

delete: Add _delete_disks method 

Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Lily Nie 2020-01-02 18:24:16 +08:00 committed by Cole Robinson
parent 52782a4958
commit 928c049c9d
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
virtManager/delete.py
View File

@ -44,7 +44,6 @@ class _vmmDeleteBase(vmmGObjectUI):
def __init__(self): def __init__(self):
vmmGObjectUI.__init__(self, "delete.ui", "vmm-delete") vmmGObjectUI.__init__(self, "delete.ui", "vmm-delete")
self.vm = None self.vm = None
self.disk = None
self.builder.connect_signals({ self.builder.connect_signals({
"on_vmm_delete_delete_event": self.close, "on_vmm_delete_delete_event": self.close,
@ -72,6 +71,21 @@ class _vmmDeleteBase(vmmGObjectUI):
def _delete_vm(self, vm): def _delete_vm(self, vm):
raise NotImplementedError raise NotImplementedError
def _delete_disks(self, vm, paths, conn, meter):
storage_errors = []
if not paths:
return
for path in paths:
try:
log.debug("Deleting path: %s", path)
meter.start(text=_("Deleting path '%s'") % path)
self._async_delete_dev(vm, conn, path, meter)
except Exception as e:
storage_errors.append((str(e),
"".join(traceback.format_exc())))
meter.end(0)
return storage_errors
def _init_state(self): def _init_state(self):
blue = Gdk.Color.parse("#0072A8")[1] blue = Gdk.Color.parse("#0072A8")[1]
self.widget("header").modify_bg(Gtk.StateType.NORMAL, blue) self.widget("header").modify_bg(Gtk.StateType.NORMAL, blue)
@ -198,7 +212,6 @@ class _vmmDeleteBase(vmmGObjectUI):
self._set_vm(None) self._set_vm(None)
def _async_delete(self, asyncjob, vm, paths): def _async_delete(self, asyncjob, vm, paths):
storage_errors = []
details = "" details = ""
try: try:
@ -208,18 +221,7 @@ class _vmmDeleteBase(vmmGObjectUI):
conn = vm.conn.get_backend() conn = vm.conn.get_backend()
meter = asyncjob.get_meter() meter = asyncjob.get_meter()
if not paths and self.disk: storage_errors = self._delete_disks(vm, paths, conn, meter)
vm.remove_device(self.disk)
for path in paths:
try:
log.debug("Deleting path: %s", path)
meter.start(text=_("Deleting path '%s'") % path)
self._async_delete_dev(vm, conn, path, meter)
except Exception as e:
storage_errors.append((str(e),
"".join(traceback.format_exc())))
meter.end(0)
self._delete_vm(vm) self._delete_vm(vm)
except Exception as e: except Exception as e:
@ -227,7 +229,6 @@ class _vmmDeleteBase(vmmGObjectUI):
(vm.get_name(), str(e))) (vm.get_name(), str(e)))
details = "".join(traceback.format_exc()) details = "".join(traceback.format_exc())
storage_errstr = "" storage_errstr = ""
for errinfo in storage_errors: for errinfo in storage_errors:
storage_errstr += "%s\n%s\n" % (errinfo[0], errinfo[1]) storage_errstr += "%s\n%s\n" % (errinfo[0], errinfo[1])
@ -322,6 +323,13 @@ class vmmDeleteStorage(_vmmDeleteBase):
def _delete_vm(self, vm): def _delete_vm(self, vm):
pass pass
def _delete_disks(self, vm, paths, conn, meter):
storage_errors = []
vm.remove_device(self.disk)
if paths:
super()._delete_disks(vm, paths, conn, meter)
return storage_errors
################### ###################
# UI init helpers # # UI init helpers #