From 1f41fd04361cb898a1a41b98818650885c90d47e Mon Sep 17 00:00:00 2001
From: Pierre <pierre.donias@gmail.com>
Date: Thu, 4 Feb 2016 11:36:04 +0100
Subject: [PATCH] Better handle of undefined maps

---
 src/api/vm.coffee | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/api/vm.coffee b/src/api/vm.coffee
index 62e785d7a..ba00a8726 100644
--- a/src/api/vm.coffee
+++ b/src/api/vm.coffee
@@ -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