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

fix(xo-server/exportDeltaVm): cannot assign ro name_label

Browse Source
This commit is contained in:
Julien Fontanet 2018-03-07 20:41:20 +01:00
parent 77a2d37d98
commit 831e36ae5f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/xo-server/src/xapi/index.js
View File

@ -804,13 +804,11 @@ export default class Xapi extends XapiBase {
if (!bypassVdiChainsCheck) { if (!bypassVdiChainsCheck) {
this._assertHealthyVdiChains(vm) this._assertHealthyVdiChains(vm)
} }
// do not use the snapshot name in the delta export
const exportedNameLabel = vm.name_label
if (!vm.is_a_snapshot) { if (!vm.is_a_snapshot) {
const { name_label } = vm
vm = await this._snapshotVm($cancelToken, vm, snapshotNameLabel) vm = await this._snapshotVm($cancelToken, vm, snapshotNameLabel)
$defer.onFailure(() => this._deleteVm(vm)) $defer.onFailure(() => this._deleteVm(vm))
// do not use the snapshot name in the delta export
vm.name_label = name_label
} }
const baseVm = baseVmId && this.getObject(baseVmId) const baseVm = baseVmId && this.getObject(baseVmId)
@ -895,6 +893,7 @@ export default class Xapi extends XapiBase {
vifs, vifs,
vm: { vm: {
...vm, ...vm,
name_label: exportedNameLabel,
other_config: other_config:
baseVm && !disableBaseTags baseVm && !disableBaseTags
? { ? {