From 71caf7ab4a1ca4606b987238c0f61531822a7ec9 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 7 Jul 2015 16:41:51 +0200
Subject: [PATCH] feature #3718: Fix cpu and memory monitoring in vms table

---
 .../app/tabs/vms-tab/utils/datatable-common.js   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
index 43b95c98bc..cdfaa96339 100644
--- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
+++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
@@ -50,6 +50,18 @@ define(function(require) {
       vncIcon = '';
     }
 
+    var cpuMonitoring = 0;
+    var memoryMonitoring = 0;
+    if (element.MONITORING) {
+      if (element.MONITORING.CPU) {
+        cpuMonitoring = element.MONITORING.CPU
+      }
+
+      if (element.MONITORING.MEMORY) {
+        memoryMonitoring = element.MONITORING.MEMORY
+      }
+    }
+    
     return [
       '<input class="check_item" type="checkbox" id="' + RESOURCE.toLowerCase() + '_' +
                              element.ID + '" name="selected_items" value="' +
@@ -59,8 +71,8 @@ define(function(require) {
        element.GNAME,
        element.NAME,
        state,
-       "TODO", //TODO new monitoring path for element.CPU,
-       Humanize.size(element.MEMORY),
+       cpuMonitoring,
+       Humanize.size(memoryMonitoring),
        OpenNebulaVM.hostnameStr(element),
        OpenNebulaVM.ipsStr(element),
        Humanize.prettyTime(element.STIME),