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

fix(vm.create): assign device to VDIs (#586)

Browse Source
This commit is contained in:
Pierre Donias 2017-07-27 19:39:08 +02:00 committed by Julien Fontanet
parent 7132a68a73
commit 2a6c476189
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/vm.coffee
View File

@ -7,6 +7,7 @@ concat = require 'lodash/concat'
endsWith = require 'lodash/endsWith'
escapeStringRegexp = require 'escape-string-regexp'
eventToPromise = require 'event-to-promise'
maxBy = require 'lodash/maxBy'
merge = require 'lodash/merge'
sortBy = require 'lodash/sortBy'
startsWith = require 'lodash/startsWith'
@ -83,7 +84,9 @@ create = $coroutine (params) ->
vms: 1
}
vdiSizesByDevice = {}
highestDevice = -1
forEach(xapi.getObject(template._xapiId).$VBDs, (vbd) =>
highestDevice = Math.max(highestDevice, vbd.userdevice)
if (
vbd.type is 'Disk' and
(vdi = vbd.$VDI)
@ -102,7 +105,7 @@ create = $coroutine (params) ->
limits.disk += size
return $assign({}, vdi, {
device: vdi.userdevice ? vdi.device ? vdi.position,
device: ++highestDevice,
size,
SR: sr._xapiId,
type: vdi.type
@ -276,7 +279,6 @@ create.params = {
items: {
type: 'object'
properties: {
device: { type: 'string' }
size: { type: ['integer', 'string'] }
SR: { type: 'string' }
type: { type: 'string' }