Merge pull request #152 from vatesfr/julienf-handle-xapiToXo-failures

Handle XAPI to XO objects failures.

src/xo.js

@@ -1010,22 +1010,30 @@ export default class Xo extends EventEmitter {
     return server
   }
 
-  _onXenAdd (xapiObjects, xapiIdsToXo) {
+  _onXenAdd (xapiObjects, xapiIdsToXo, toRetry) {
     const {_objects: objects} = this
     forEach(xapiObjects, (xapiObject, xapiId) => {
-      const xoObject = xapiObjectToXo(xapiObject)
+      try {
+        const xoObject = xapiObjectToXo(xapiObject)
 
-      if (xoObject) {
-        xapiIdsToXo[xapiId] = xoObject.id
+        if (xoObject) {
+          xapiIdsToXo[xapiId] = xoObject.id
 
-        objects.set(xoObject)
+          objects.set(xoObject)
+        }
+      } catch (error) {
+        console.error('ERROR: xapiObjectToXo', error)
+
+        toRetry[xapiId] = xapiObject
       }
     })
   }
 
-  _onXenRemove (xapiObjects, xapiIdsToXo) {
+  _onXenRemove (xapiObjects, xapiIdsToXo, toRetry) {
     const {_objects: objects} = this
     forEach(xapiObjects, (_, xapiId) => {
+      toRetry && delete toRetry[xapiId]
+
       const xoId = xapiIdsToXo[xapiId]
 
       if (xoId) {
@@ -1048,17 +1056,37 @@ export default class Xo extends EventEmitter {
     })
 
     xapi.xo = (() => {
+      // Maps ids of XAPI objects to ids of XO objecs.
       const xapiIdsToXo = createRawObject()
+
+      // Map of XAPI objects which failed to be transformed to XO
+      // objects.
+      //
+      // At each `finish` there will be another attempt to transform
+      // until they succeed.
+      let toRetry
+      let toRetryNext = createRawObject()
+
       const onAddOrUpdate = objects => {
-        this._onXenAdd(objects, xapiIdsToXo)
+        this._onXenAdd(objects, xapiIdsToXo, toRetryNext)
       }
       const onRemove = objects => {
-        this._onXenRemove(objects, xapiIdsToXo)
+        this._onXenRemove(objects, xapiIdsToXo, toRetry)
       }
       const onFinish = () => {
         if (xapi.pool) {
           this._xapis[xapi.pool.$id] = xapi
         }
+
+        if (!isEmpty(toRetry)) {
+          onAddOrUpdate(toRetry)
+          toRetry = null
+        }
+
+        if (!isEmpty(toRetryNext)) {
+          toRetry = toRetryNext
+          toRetryNext = createRawObject()
+        }
       }
 
       const { objects } = xapi