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

Better handle of undefined maps

Browse Source
This commit is contained in:
Pierre 2016-02-04 11:36:04 +01:00
parent e0bbefdfae
commit 1f41fd0436
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/api/vm.coffee
View File

@ -198,15 +198,17 @@ migrate = $coroutine ({
mapVifsNetworks,
migrationNetwork
}) ->
mapVdisSrsXapi = {}
forEach mapVdisSrs, (srId, vdiId) =>
vdiXapiId = @getObject(vdiId, 'VDI')._xapiId
mapVdisSrsXapi[vdiXapiId] = @getObject(srId, 'SR')._xapiId
if mapVdisSrs
mapVdisSrsXapi = {}
forEach mapVdisSrs, (srId, vdiId) =>
vdiXapiId = @getObject(vdiId, 'VDI')._xapiId
mapVdisSrsXapi[vdiXapiId] = @getObject(srId, 'SR')._xapiId
mapVifsNetworksXapi = {}
forEach mapVifsNetworks, (networkId, vifId) =>
vifXapiId = @getObject(vifId, 'VIF')._xapiId
mapVifsNetworksXapi[vifXapiId] = @getObject(networkId, 'network')._xapiId
if mapVifsNetworks
mapVifsNetworksXapi = {}
forEach mapVifsNetworks, (networkId, vifId) =>
vifXapiId = @getObject(vifId, 'VIF')._xapiId
mapVifsNetworksXapi[vifXapiId] = @getObject(networkId, 'network')._xapiId
permissions = []
for vif, network of mapVifsNetworks
@ -226,8 +228,8 @@ migrate = $coroutine ({
yield @getXapi(vm).migrateVm(vm._xapiId, @getXapi(host), host._xapiId, {
migrationNetworkId: migrationNetwork?._xapiId
mapVifsNetworks: mapVifsNetworks && mapVifsNetworksXapi,
mapVdisSrs: mapVdisSrs && mapVdisSrsXapi,
mapVifsNetworks: mapVifsNetworksXapi,
mapVdisSrs: mapVdisSrsXapi,
})
return