diff --git a/branches/ucs-4.0/ucs-4.0-3/virtualization/univention-virtual-machine-manager-daemon/src/univention/uvmm/node.py b/branches/ucs-4.0/ucs-4.0-3/virtualization/univention-virtual-machine-manager-daemon/src/univention/uvmm/node.py index 9f7aad5..047d9ef 100644 --- a/branches/ucs-4.0/ucs-4.0-3/virtualization/univention-virtual-machine-manager-daemon/src/univention/uvmm/node.py +++ b/branches/ucs-4.0/ucs-4.0-3/virtualization/univention-virtual-machine-manager-daemon/src/univention/uvmm/node.py @@ -1520,7 +1520,7 @@ def domain_migrate(source_uri, domain, target_uri): target_conn.defineXML(xml) except IOError, ex: raise NodeError(_('Error migrating domain "%(domain)s": %(error)s'), domain=domain, error=ex) - elif source_state in (libvirt.VIR_DOMAIN_RUNNING, libvirt.VIR_DOMAIN_BLOCKED): + elif source_state in (libvirt.VIR_DOMAIN_RUNNING, libvirt.VIR_DOMAIN_BLOCKED, libvirt.VIR_DOMAIN_PAUSED): # running domains are live migrated flags = libvirt.VIR_MIGRATE_LIVE | libvirt.VIR_MIGRATE_PERSIST_DEST | libvirt.VIR_MIGRATE_UNDEFINE_SOURCE target_dom = source_dom.migrate(target_conn, flags, None, None, 0) diff --git a/branches/ucs-4.0/ucs-4.0-3/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm.js b/branches/ucs-4.0/ucs-4.0-3/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm.js index 4da3e50..121ce84 100644 --- a/branches/ucs-4.0/ucs-4.0-3/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm.js +++ b/branches/ucs-4.0/ucs-4.0-3/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm.js @@ -1474,7 +1474,8 @@ define([ isMultiAction: true, callback: lang.hitch(this, '_migrateDomain' ), canExecute: function(item) { - return item.state != 'PAUSED'; // FIXME need to find out if there are more than one node of this type + // FIXME need to find out if there are more than one node of this type + return !isTerminated(item); } }, { name: 'remove',