From 51609d45a2222a04e9e0d9a436e999d1bf507d5d Mon Sep 17 00:00:00 2001
From: Olivier Lambert <olivier.lambert@vates.fr>
Date: Fri, 6 Apr 2018 14:26:44 +0200
Subject: [PATCH] feat(xo-web,xo-server): expose VM Xen Tools version (#2838)

Fixes #2650
---
 packages/xo-server/src/xapi-object-to-xo.js   | 10 ++++------
 packages/xo-web/src/common/intl/messages.js   |  7 +------
 packages/xo-web/src/common/utils.js           | 15 ---------------
 packages/xo-web/src/xo-app/vm/tab-advanced.js |  5 +----
 4 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/packages/xo-server/src/xapi-object-to-xo.js b/packages/xo-server/src/xapi-object-to-xo.js
index 39e518d38..80c63e62b 100644
--- a/packages/xo-server/src/xapi-object-to-xo.js
+++ b/packages/xo-server/src/xapi-object-to-xo.js
@@ -232,13 +232,11 @@ const TRANSFORMS = {
       }
 
       const { major, minor } = guestMetrics.PV_drivers_version
-      const [hostMajor, hostMinor] = (
-        obj.$resident_on || obj.$pool.$master
-      ).software_version.product_version.split('.')
 
-      return major >= hostMajor && minor >= hostMinor
-        ? 'up to date'
-        : 'out of date'
+      return {
+        major,
+        minor,
+      }
     })()
 
     let resourceSet = otherConfig['xo:resource_set']
diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
index e92f88f3e..e514d288b 100644
--- a/packages/xo-web/src/common/intl/messages.js
+++ b/packages/xo-web/src/common/intl/messages.js
@@ -894,12 +894,7 @@ const messages = {
   cpuCapLabel: 'CPU cap',
   defaultCpuCap: 'Default ({value, number})',
   pvArgsLabel: 'PV args',
-  xenToolsStatus: 'Xen tools status',
-  xenToolsStatusValue: {
-    defaultMessage: '{status}',
-    description:
-      'status can be `not-installed`, `unknown`, `out-of-date` & `up-to-date`',
-  },
+  xenToolsStatus: 'Xen tools version',
   osName: 'OS name',
   osKernel: 'OS kernel',
   autoPowerOn: 'Auto power on',
diff --git a/packages/xo-web/src/common/utils.js b/packages/xo-web/src/common/utils.js
index 857ba8fe0..ef7967312 100644
--- a/packages/xo-web/src/common/utils.js
+++ b/packages/xo-web/src/common/utils.js
@@ -219,21 +219,6 @@ export const parseSize = size => {
 
 // -------------------------------------------------------------------
 
-export const normalizeXenToolsStatus = status => {
-  if (status === false) {
-    return 'not-installed'
-  }
-  if (status === undefined) {
-    return 'unknown'
-  }
-  if (status === 'up to date') {
-    return 'up-to-date'
-  }
-  return 'out-of-date'
-}
-
-// -------------------------------------------------------------------
-
 const _NotFound = () => <h1>{_('errorPageNotFound')}</h1>
 
 // Decorator to declare routes on a component.
diff --git a/packages/xo-web/src/xo-app/vm/tab-advanced.js b/packages/xo-web/src/xo-app/vm/tab-advanced.js
index 31e1a45ac..d7af851f8 100644
--- a/packages/xo-web/src/xo-app/vm/tab-advanced.js
+++ b/packages/xo-web/src/xo-app/vm/tab-advanced.js
@@ -20,7 +20,6 @@ import {
   connectStore,
   formatSize,
   getCoresPerSocketPossibilities,
-  normalizeXenToolsStatus,
   osFamily,
 } from 'utils'
 import {
@@ -561,9 +560,7 @@ export default connectStore(() => {
             <tr>
               <th>{_('xenToolsStatus')}</th>
               <td>
-                {_('xenToolsStatusValue', {
-                  status: normalizeXenToolsStatus(vm.xenTools),
-                })}
+                {vm.xenTools && `${vm.xenTools.major}.${vm.xenTools.minor}`}
               </td>
             </tr>
             <tr>