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