From f3d3c628096ba5398eb79891ae787b495e48a5a7 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Wed, 31 May 2017 18:10:03 +0200
Subject: [PATCH] fix(xapi-objects-to-xo): XenServer 5 support (#561)

---
 package.json             |  2 +-
 src/xapi-object-to-xo.js |  8 +++++---
 yarn.lock                | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 76dd2844b..c9c5a7895 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "tmp": "^0.0.31",
     "uuid": "^3.0.1",
     "ws": "^3.0.0",
-    "xen-api": "^0.12.1",
+    "xen-api": "^0.12.2",
     "xml2js": "~0.4.17",
     "xo-acl-resolver": "^0.2.3",
     "xo-collection": "^0.4.1",
diff --git a/src/xapi-object-to-xo.js b/src/xapi-object-to-xo.js
index c874b0b42..12fb5c32b 100644
--- a/src/xapi-object-to-xo.js
+++ b/src/xapi-object-to-xo.js
@@ -135,17 +135,19 @@ const TRANSFORMS = {
       })
     }
 
+    const cpuInfo = obj.cpu_info
+
     return {
       // Deprecated
-      CPUs: obj.cpu_info,
+      CPUs: cpuInfo,
 
       address: obj.address,
       bios_strings: obj.bios_strings,
       build: obj.software_version.build_number,
       enabled: Boolean(obj.enabled),
       cpus: {
-        cores: +obj.cpu_info.cpu_count,
-        sockets: +obj.cpu_info.socket_count
+        cores: cpuInfo && +cpuInfo.cpu_count,
+        sockets: cpuInfo && +cpuInfo.socket_count
       },
       current_operations: obj.current_operations,
       hostname: obj.hostname,
diff --git a/yarn.lock b/yarn.lock
index a26604082..b066b83a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4427,11 +4427,11 @@ ltgt@^2.1.2, ltgt@~2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34"
 
-make-error@^1:
+make-error@^1, make-error@^1.0.2, make-error@^1.2.1, make-error@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.2.3.tgz#6c4402df732e0977ac6faf754a5074b3d2b1d19d"
 
-make-error@^1.0.2, make-error@^1.2.0, make-error@^1.2.1, make-error@^1.2.2, make-error@^1.2.3, make-error@^1.3.0:
+make-error@^1.2.0, make-error@^1.2.2, make-error@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
 
@@ -6793,9 +6793,9 @@ xdg-basedir@^2.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-xen-api@^0.12.1:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/xen-api/-/xen-api-0.12.1.tgz#b9da5489ce9a0d7fe61f2c3d6e509c3e95094f36"
+xen-api@^0.12.2:
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/xen-api/-/xen-api-0.12.2.tgz#5fe71e9734bf02e80fe3dce52352cb57e3b49ca0"
   dependencies:
     babel-polyfill "^6.23.0"
     blocked "^1.2.1"