NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(vm.start): with force can bypass blocked operation (#550)

Browse Source 
See vatesfr/xo-web#2119
This commit is contained in:
badrAZ 2017-05-23 10:59:22 +02:00 committed by Julien Fontanet
parent 90be44738d
commit 9c5df507ae
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/vm.coffee
View File

@ -892,10 +892,11 @@ exports.rollingDrCopy = rollingDrCopy
#--------------------------------------------------------------------- #---------------------------------------------------------------------
start = ({vm}) -> start = ({vm, force}) ->
return @getXapi(vm).startVm(vm._xapiId) return @getXapi(vm).startVm(vm._xapiId, force)
start.params = { start.params = {
force: { type: 'boolean', optional: true}
id: { type: 'string' } id: { type: 'string' }
} }

12
src/xapi/index.js
View File

@ -1433,9 +1433,15 @@ export default class Xapi extends XapiBase {
await this._updateObjectMapProperty(vm, 'VCPUs_params', {weight}) await this._updateObjectMapProperty(vm, 'VCPUs_params', {weight})
} }
_startVm (vm) { async _startVm (vm, force) {
debug(`Starting VM ${vm.name_label}`) debug(`Starting VM ${vm.name_label}`)
if (force) {
await this._updateObjectMapProperty(vm, 'blocked_operations', {
start: null
})
}
return this.call( return this.call(
'VM.start', 'VM.start',
vm.$ref, vm.$ref,
@ -1444,9 +1450,9 @@ export default class Xapi extends XapiBase {
) )
} }
async startVm (vmId) { async startVm (vmId, force) {
try { try {
await this._startVm(this.getObject(vmId)) await this._startVm(this.getObject(vmId), force)
} catch (e) { } catch (e) {
if (e.code === 'OPERATION_BLOCKED') { if (e.code === 'OPERATION_BLOCKED') {
throw forbiddenOperation('Start', e.params[1]) throw forbiddenOperation('Start', e.params[1])