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

Use $ to prefix injected params names.

Browse Source
This commit is contained in:
Julien Fontanet 2016-01-17 10:36:12 +01:00
parent 2061a006d0
commit 98899ece72
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/xapi.js
View File

@ -1215,9 +1215,9 @@ export default class Xapi extends XapiBase {
// Create a snapshot of the VM and returns a delta export object.
@deferrable.onFailure
async exportDeltaVm (onFailure, vmId, baseVmId = undefined) {
async exportDeltaVm ($onFailure, vmId, baseVmId = undefined) {
const vm = await this.snapshotVm(vmId)
onFailure(() => this._deleteVm(vm, true))
$onFailure(() => this._deleteVm(vm, true))
const baseVm = baseVmId && this.getObject(baseVmId, null)
@ -1265,7 +1265,8 @@ export default class Xapi extends XapiBase {
}
}
: vdi
streams[`${vdiId}.vhd`] = this._exportVdi(vdi, baseVdi, VDI_FORMAT_VHD)
const stream = streams[`${vdiId}.vhd`] = this._exportVdi(vdi, baseVdi, VDI_FORMAT_VHD)
$onFailure(() => stream.cancel())
})
const vifs = {}
@ -1293,7 +1294,7 @@ export default class Xapi extends XapiBase {
}
@deferrable.onFailure
async importDeltaVm (onFailure, delta, {
async importDeltaVm ($onFailure, delta, {
deleteBase = false,
name_label = delta.vm.name_label,
srId = this.pool.default_SR
@ -1328,7 +1329,7 @@ export default class Xapi extends XapiBase {
is_a_template: false
})
)
onFailure(() => this._deleteVm(vm))
$onFailure(() => this._deleteVm(vm))
await Promise.all([
this._setObjectProperties(vm, {
@ -1361,7 +1362,7 @@ export default class Xapi extends XapiBase {
},
sr: sr.$id
})
onFailure(() => this._deleteVdi(newVdi))
$onFailure(() => this._deleteVdi(newVdi))
return newVdi
}
@ -1377,7 +1378,7 @@ export default class Xapi extends XapiBase {
const newVdi = await this._getOrWaitObject(
await this._cloneVdi(baseVdi)
)
onFailure(() => this._deleteVdi(newVdi))
$onFailure(() => this._deleteVdi(newVdi))
await this._updateObjectMapProperty(newVdi, 'other_config', {
[TAG_COPY_SRC]: vdi.uuid

6
src/xo-mixins/backups.js
View File

@ -118,7 +118,7 @@ export default class {
// -----------------------------------------------------------------
@deferrable.onFailure
async deltaCopyVm (onFailure, srcVm, targetSr) {
async deltaCopyVm ($onFailure, srcVm, targetSr) {
const srcXapi = this._xo.getXapi(srcVm)
const targetXapi = this._xo.getXapi(targetSr)
@ -132,8 +132,8 @@ export default class {
// 2. Copy.
const dstVm = await (async () => {
const delta = await srcXapi.exportDeltaVm(srcVm.$id, localBaseId)
onFailure(async () => {
const delta = await srcXapi.exportDeltaVm(srcVm.$id, localBaseUuid)
$onFailure(async () => {
await Promise.all(mapToArray(
delta.streams,
stream => stream.cancel()