details: Don't silently drop managed save when renaming VM

Instead just error about it. Until there's an actual libvirt 'rename'
API we can't do much better than that.
This commit is contained in:
Cole Robinson 2013-09-30 15:23:14 -04:00
parent 5f34e7d885
commit 844a567e7b
6 changed files with 18 additions and 10 deletions

View File

@ -734,7 +734,7 @@ class vmmConnection(vmmGObject):
def _rename_helper(self, objtype, define_cb, obj, origxml, newxml):
# Undefine the original object
obj.delete()
obj.delete(force=False)
newobj = None
try:

View File

@ -157,7 +157,8 @@ class vmmDomainSnapshot(vmmLibvirtObject):
def is_current(self):
return self._backend.isCurrent()
def delete(self):
def delete(self, force=True):
ignore = force
self._backend.delete()
@ -1211,7 +1212,8 @@ class vmmDomain(vmmLibvirtObject):
self._backend.suspend()
self.idle_add(self.force_update_status)
def delete(self):
def delete(self, force=True):
if force:
try:
self.removeSavedImage()
except:

View File

@ -88,7 +88,8 @@ class vmmInterface(vmmLibvirtObject):
self.idle_add(self.refresh_xml)
self._kick_conn()
def delete(self):
def delete(self, force=True):
ignore = force
self._backend.undefine()
self._kick_conn()

View File

@ -104,6 +104,9 @@ class vmmLibvirtObject(vmmGObject):
ignore = xml
return
def delete(self, force=True):
ignore = force
##################
# Public XML API #

View File

@ -94,7 +94,8 @@ class vmmNetwork(vmmLibvirtObject):
self._backend.destroy()
self._kick_conn()
def delete(self):
def delete(self, force=True):
ignore = force
self._backend.undefine()
self._backend = None
self._kick_conn()

View File

@ -52,7 +52,8 @@ class vmmStorageVolume(vmmLibvirtObject):
pobj = self._backend.storagePoolLookupByVolume()
return self.conn.get_pool_by_name(pobj.name())
def delete(self):
def delete(self, force=True):
ignore = force
self._backend.delete(0)
self._backend = None