Merge pull request #183 from vatesfr/pierre-delete-running-vm

Delete not halted VMs. (vatesfr/xo-web/issues/616)
This commit is contained in:
Julien Fontanet
2015-12-31 09:48:37 +01:00

View File

@@ -986,8 +986,10 @@ export default class Xapi extends XapiBase {
}
async _deleteVm (vm, deleteDisks) {
if (isVmRunning(vm)) {
throw new Error('running VMs cannot be deleted')
// It is necessary for suspended VMs to be shut down
// to be able to delete their VDIs.
if (vm.power_state !== 'Halted') {
await this.call('VM.hard_shutdown', vm.$ref)
}
if (deleteDisks) {