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

Xapi#createVdi() use default_SR if necessary.

Browse Source
This commit is contained in:
Julien Fontanet 2015-06-24 16:27:16 +02:00
parent eff50daae4
commit a7203e9a17
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/disk.js
View File

@ -3,8 +3,9 @@ import {parseSize} from '../utils'
// ===================================================================
export async function create ({name, size, sr}) {
const vdi = await this.getXAPI(sr).createVdi(sr.id, parseSize(size), {
name_label: name
const vdi = await this.getXAPI(sr).createVdi(parseSize(size), {
name_label: name,
sr
})
return vdi.$id
}
@ -14,7 +15,7 @@ create.description = 'create a new disk on a SR'
create.params = {
name: { type: 'string' },
size: { type: 'string' },
sr: { type: 'string' }
sr: { type: 'string', optional: true }
}
create.resolve = {

15
src/xapi.js
View File

@ -522,11 +522,11 @@ export default class Xapi extends XapiBase {
const {$default_SR: defaultSr} = this.pool
await Promise.all(map(vdis, (vdiDescription, i) => {
return this._createVdi(
this.getObject(vdiDescription.sr || vdiDescription.SR, defaultSr),
vdiDescription.size,
{
name_label: vdiDescription.name_label,
name_description: vdiDescription.name_description
name_description: vdiDescription.name_description,
sr: vdiDescription.sr || vdiDescription.SR
}
)
.then(ref => this._getOrWaitObject(ref))
@ -690,9 +690,10 @@ export default class Xapi extends XapiBase {
return vbdRef
}
async _createVdi (sr, size, {
async _createVdi (size, {
name_label = '',
name_description = undefined
name_description = undefined,
sr = this.pool.default_SR
} = {}) {
return await this.call('VDI.create', {
name_label: name_label,
@ -700,7 +701,7 @@ export default class Xapi extends XapiBase {
other_config: {},
read_only: false,
sharable: false,
SR: sr.$ref,
SR: this.getObject(sr).$ref,
type: 'user',
virtual_size: String(size)
})
@ -749,9 +750,9 @@ export default class Xapi extends XapiBase {
)
}
async createVdi (srId, size, opts) {
async createVdi (size, opts) {
return await this._getOrWaitObject(
await this._createVdi(this.getObject(srId), size, opts)
await this._createVdi(size, opts)
)
}