Mercurial > hg > thermostat-ng > web-client

changeset 244:63df0ca94b6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix system-memory data format inconsistencies for multicharts Reviewed-by: jkang Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-October/025384.html
author Andrew Azores <aazores@redhat.com>
date Fri, 13 Oct 2017 11:39:51 -0400
parents e73fafd4a1a6
children 2eb2ae0f3b3f
files src/app/components/system-info/system-memory/system-memory.controller.js src/app/components/system-info/system-memory/system-memory.controller.spec.js
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/app/components/system-info/system-memory/system-memory.controller.js	Wed Oct 11 14:57:28 2017 -0400
+++ b/src/app/components/system-info/system-memory/system-memory.controller.js	Fri Oct 13 11:39:51 2017 -0400
@@ -230,8 +230,8 @@
     return new Promise(resolve =>
       this._svc.getMemoryInfo(this.systemId).then(resp => {
         let data = resp.data.response[0];
-        let free = data.free;
-        let total = data.total;
+        let free = this._metricToNumber(data.free);
+        let total = this._metricToNumber(data.total);
         let used = total - free;
         let usage = Math.round(used / total * 100);
         resolve(usage);
--- a/src/app/components/system-info/system-memory/system-memory.controller.spec.js	Wed Oct 11 14:57:28 2017 -0400
+++ b/src/app/components/system-info/system-memory/system-memory.controller.spec.js	Fri Oct 13 11:39:51 2017 -0400
@@ -175,8 +175,8 @@
           data: {
             response: [
               {
-                total: tup[0],
-                free: tup[1]
+                total: { $numberLong: tup[0].toString() },
+                free: { $numberLong: tup[1].toString() }
               }
             ]
           }