From f3355a0891198170415824e81bee1209dfe48ad1 Mon Sep 17 00:00:00 2001 From: juanmont Date: Mon, 14 Nov 2016 12:02:58 +0100 Subject: [PATCH 1/5] F #4901: Add support for values RESERVED_CPU and RESERVED_MEM - Added new slider in info (hosts-tab) --- .../public/app/tabs/hosts-tab/panels/info.js | 60 +++++++++++++++++-- .../app/tabs/hosts-tab/panels/info/html.hbs | 32 ++++++---- 2 files changed, 74 insertions(+), 18 deletions(-) diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js index ee2d8ace74..d80dce0c21 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js @@ -13,12 +13,11 @@ /* See the License for the specific language governing permissions and */ /* limitations under the License. */ /* -------------------------------------------------------------------------- */ - define(function(require) { /* DEPENDENCIES */ - + require('foundation'); var Locale = require('utils/locale'); var Humanize = require('utils/humanize'); var RenameTr = require('utils/panel/rename-tr'); @@ -31,6 +30,7 @@ define(function(require) { var DatastoresCapacityTable = require('../utils/datastores-capacity-table'); var CanImportWilds = require('../utils/can-import-wilds'); var Sunstone = require('sunstone'); + var TemplateUtils = require('utils/template-utils'); /* TEMPLATES @@ -59,7 +59,6 @@ define(function(require) { that.icon = "fa-info-circle"; that.element = info[XML_ROOT]; - that.canImportWilds = CanImportWilds(that.element); // Hide information of the Wild VMs of the Host and the ESX Hosts @@ -88,7 +87,6 @@ define(function(require) { /* FUNCTION DEFINITIONS */ - function _html() { var templateTableHTML = TemplateTable.html( this.strippedTemplate, @@ -101,6 +99,12 @@ define(function(require) { var cpuBars = CPUBars.html(this.element); var memoryBars = MemoryBars.html(this.element); var datastoresCapacityTableHTML = DatastoresCapacityTable.html(this.element); + var realCPU = parseInt(this.element.HOST_SHARE.FREE_CPU); + if(this.element.HOST_SHARE.USED_CPU != "") + realCPU += parseInt(this.element.HOST_SHARE.USED_CPU); + var realMEM = parseInt(this.element.HOST_SHARE.FREE_MEM); + if(this.element.HOST_SHARE.USED_MEM != "") + realMEM += parseInt(this.element.HOST_SHARE.USED_MEM); return TemplateInfo({ 'element': this.element, @@ -111,10 +115,31 @@ define(function(require) { 'cpuBars': cpuBars, 'memoryBars': memoryBars, 'stateStr': OpenNebulaHost.stateStr(this.element.STATE), - 'datastoresCapacityTableHTML': datastoresCapacityTableHTML + 'datastoresCapacityTableHTML': datastoresCapacityTableHTML, + 'maxReservedCPU': realCPU * 2, + 'realCPU': realCPU, + 'realMEM': Humanize.size(realMEM), + 'maxReservedMEM': realMEM * 2, + 'virtualMEMInput': Humanize.size(this.element.HOST_SHARE.MAX_MEM) }); } + function changeBarCPU(){ + document.getElementById('textInput_reserved_cpu').value = document.getElementById('change_bar_cpu').value; + } + + function changeInputCPU(){ + document.getElementById('change_bar_cpu').value = document.getElementById('textInput_reserved_cpu').value; + } + + function changeBarMEM(){ + document.getElementById('textInput_reserved_mem').value = Humanize.size(parseInt(document.getElementById('change_bar_mem').value)); + } + + function changeInputMEM(){ + document.getElementById('change_bar_mem').value = parseInt(document.getElementById('textInput_reserved_mem').value); + } + function _setup(context) { var that = this; @@ -123,7 +148,7 @@ define(function(require) { TemplateTable.setup(this.strippedTemplate, RESOURCE, this.element.ID, context, this.unshownTemplate); PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context); - $(".edit_reserved", context).on("click", function(){ + $("", context).on("click", function(){ var dialog = Sunstone.getDialog(OVERCOMMIT_DIALOG_ID); dialog.setParams( @@ -137,6 +162,29 @@ define(function(require) { return false; }); + //.off and .on prevent multiple clicks events + $(document).off('click', '.update_reserved').on("click", '.update_reserved', function(){ + var reservedCPU = parseInt(document.getElementById('change_bar_cpu').value); + var CPU = parseInt(that.element.HOST_SHARE.FREE_CPU); + var reservedMem = parseInt(document.getElementById('change_bar_mem').value); + var MEM = parseInt(that.element.HOST_SHARE.FREE_MEM); + if(parseInt(that.element.HOST_SHARE.USED_CPU) > 0) + CPU += parseInt(that.element.HOST_SHARE.USED_CPU); + reservedCPU = CPU - reservedCPU; + if(parseInt(that.element.HOST_SHARE.USED_MEM) > 0) + MEM += parseInt(that.element.HOST_SHARE.USED_MEM); + reservedMem = MEM - reservedMem; + + var obj = {RESERVED_CPU: reservedCPU, RESERVED_MEM: reservedMem}; + Sunstone.runAction("Host.append_template", that.element.ID, TemplateUtils.templateToString(obj)); + }); + + + document.getElementById("change_bar_cpu").addEventListener("change", changeBarCPU); + document.getElementById("textInput_reserved_cpu").addEventListener("change", changeInputCPU); + document.getElementById("change_bar_mem").addEventListener("change", changeBarMEM); + document.getElementById("textInput_reserved_mem").addEventListener("change", changeInputMEM); + return false; } }); diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs index 972e0236a3..819b54698c 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs @@ -73,30 +73,38 @@ + {{{datastoresCapacityTableHTML}}} + + +
+
- + - + - - + + - + - - + +
{{tr "Overcommitment"}}{{tr "Overcommitment"}} + + + +
{{tr "Reserved CPU"}}{{valOrDefault element.TEMPLATE.RESERVED_CPU "-"}} - - +
{{tr "Reserved Memory"}}{{humanizeSize "KB" element.TEMPLATE.RESERVED_MEM}} - - +
- {{{datastoresCapacityTableHTML}}}
From ea2bd35dd9361d1e8811a7da05a918fb0a80cacb Mon Sep 17 00:00:00 2001 From: juanmont Date: Mon, 14 Nov 2016 18:16:07 +0100 Subject: [PATCH 2/5] F #4901 Added new slider for RESERVED_CPU and RESERVED_MEM in hosts and clusters --- .../app/tabs/clusters-tab/panels/info.js | 56 ++++++++++++++----- .../tabs/clusters-tab/panels/info/html.hbs | 54 ++++++++++-------- .../public/app/tabs/hosts-tab/panels/info.js | 35 +++++------- .../app/tabs/hosts-tab/panels/monitor.js | 12 ++-- 4 files changed, 94 insertions(+), 63 deletions(-) diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js index 40bbcc219f..22fee8f2e1 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js @@ -24,6 +24,7 @@ define(function(require) { var RenameTr = require('utils/panel/rename-tr'); var TemplateTable = require('utils/panel/template-table'); var Sunstone = require('sunstone'); + var TemplateUtils = require('utils/template-utils'); /* CONSTANTS @@ -47,12 +48,13 @@ define(function(require) { this.icon = "fa-info-circle"; this.element = info[XML_ROOT]; + this.percent = false; // Hide information in the template table. Unshow values are stored // in the unshownTemplate object to be used when the element info is updated. that.unshownTemplate = {}; that.strippedTemplate = {}; - var unshownKeys = ['RESERVED_CPU', 'RESERVED_MEM']; + var unshownKeys = ['HOST', 'RESERVED_CPU', 'RESERVED_MEM']; $.each(that.element.TEMPLATE, function(key, value) { if ($.inArray(key, unshownKeys) > -1) { that.unshownTemplate[key] = value; @@ -80,14 +82,43 @@ define(function(require) { this.strippedTemplate, RESOURCE, Locale.tr("Attributes")); - + var reservedMem; + (this.element.TEMPLATE.RESERVED_MEM != "0%")?reservedMem = parseInt(this.element.TEMPLATE.RESERVED_MEM): reservedMem = 0; + var reservedCPU + (this.element.TEMPLATE.RESERVED_CPU != "0%")? reservedCPU = parseInt(this.element.TEMPLATE.RESERVED_CPU): reservedCPU = 0; return TemplateHTML({ 'element': this.element, 'renameTrHTML': renameTrHTML, - 'templateTableHTML': templateTableHTML + 'templateTableHTML': templateTableHTML, + 'percentCPU': reservedCPU, + 'percentMEM': reservedMem, }); } + function changeBarCPU(){ + if(parseInt(document.getElementById('change_bar_cpu').value) > 0) + document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_cpu').value) < 0) + document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; + document.getElementById('textInput_reserved_cpu').value = document.getElementById('change_bar_cpu').value; + } + + function changeInputCPU(){ + document.getElementById('change_bar_cpu').value = document.getElementById('textInput_reserved_cpu').value; + } + + function changeBarMEM(){ + if(parseInt(document.getElementById('change_bar_mem').value) > 0) + document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_mem').value) < 0) + document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; + document.getElementById('textInput_reserved_mem').value = document.getElementById('change_bar_mem').value; + } + + function changeInputMEM(){ + document.getElementById('change_bar_mem').value = document.getElementById('textInput_reserved_mem').value; + } + function _setup(context) { var that = this; @@ -95,18 +126,17 @@ define(function(require) { TemplateTable.setup(this.strippedTemplate, RESOURCE, this.element.ID, context, this.unshownTemplate); - $(".edit_reserved", context).on("click", function(){ - var dialog = Sunstone.getDialog(OVERCOMMIT_DIALOG_ID); + document.getElementById("change_bar_cpu").addEventListener("change", changeBarCPU); + document.getElementById("textInput_reserved_cpu").addEventListener("change", changeInputCPU); + document.getElementById("change_bar_mem").addEventListener("change", changeBarMEM); + document.getElementById("textInput_reserved_mem").addEventListener("change", changeInputMEM); - dialog.setParams( - { element: that.element, - action : "Cluster.append_template", - resourceName : Locale.tr("Cluster"), - tabId : TAB_ID - }); + $(document).off('click', '.update_reserved').on("click", '.update_reserved', function(){ + var reservedCPU = document.getElementById('change_bar_cpu').value+'%'; + var reservedMem = document.getElementById('change_bar_mem').value+'%'; - dialog.show(); - return false; + var obj = {RESERVED_CPU: reservedCPU, RESERVED_MEM: reservedMem}; + Sunstone.runAction("Cluster.append_template", that.element.ID, TemplateUtils.templateToString(obj)); }); } }); diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs index 0cff5f2cb7..8cf496f1eb 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs @@ -31,31 +31,39 @@ {{{renameTrHTML}}} - - - - - - - - - - - - - - - - - - -
{{tr "Overcommitment"}}
{{tr "Reserved CPU"}}{{valOrDefault element.TEMPLATE.RESERVED_CPU "-"}} - -
{{tr "Reserved Memory"}}{{humanizeSize "KB" element.TEMPLATE.RESERVED_MEM}} - -
+
+
+ + + + + + + + + + + + + + + + + + +
{{tr "Overcommitment"}} + + + +
{{tr "Reserved CPU"}} +
{{tr "Reserved Memory"}} +
+
+
{{{templateTableHTML}}} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js index d80dce0c21..91f6831b01 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js @@ -92,19 +92,16 @@ define(function(require) { this.strippedTemplate, RESOURCE, Locale.tr("Attributes")); - + console.log(this.element); var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME); var clusterTrHTML = ClusterTr.html(this.element.CLUSTER); var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element); var cpuBars = CPUBars.html(this.element); var memoryBars = MemoryBars.html(this.element); var datastoresCapacityTableHTML = DatastoresCapacityTable.html(this.element); - var realCPU = parseInt(this.element.HOST_SHARE.FREE_CPU); - if(this.element.HOST_SHARE.USED_CPU != "") - realCPU += parseInt(this.element.HOST_SHARE.USED_CPU); - var realMEM = parseInt(this.element.HOST_SHARE.FREE_MEM); - if(this.element.HOST_SHARE.USED_MEM != "") - realMEM += parseInt(this.element.HOST_SHARE.USED_MEM); + var realCPU = parseInt(this.element.HOST_SHARE.TOTAL_CPU); + var realMEM = parseInt(this.element.HOST_SHARE.TOTAL_MEM); + return TemplateInfo({ 'element': this.element, @@ -116,15 +113,19 @@ define(function(require) { 'memoryBars': memoryBars, 'stateStr': OpenNebulaHost.stateStr(this.element.STATE), 'datastoresCapacityTableHTML': datastoresCapacityTableHTML, + 'maxReservedMEM': realMEM * 2, 'maxReservedCPU': realCPU * 2, 'realCPU': realCPU, 'realMEM': Humanize.size(realMEM), - 'maxReservedMEM': realMEM * 2, 'virtualMEMInput': Humanize.size(this.element.HOST_SHARE.MAX_MEM) }); } function changeBarCPU(){ + if(parseInt(document.getElementById('change_bar_cpu').value) > this.element.HOST_SHARE.TOTAL_CPU) + document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_cpu').value) < this.element.HOST_SHARE.TOTAL_CPU) + document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; document.getElementById('textInput_reserved_cpu').value = document.getElementById('change_bar_cpu').value; } @@ -133,6 +134,10 @@ define(function(require) { } function changeBarMEM(){ + if(parseInt(document.getElementById('change_bar_mem').value) > this.element.HOST_SHARE.TOTAL_MEM) + document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_mem').value) < this.element.HOST_SHARE.TOTAL_MEM) + document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; document.getElementById('textInput_reserved_mem').value = Humanize.size(parseInt(document.getElementById('change_bar_mem').value)); } @@ -148,20 +153,6 @@ define(function(require) { TemplateTable.setup(this.strippedTemplate, RESOURCE, this.element.ID, context, this.unshownTemplate); PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context); - $("", context).on("click", function(){ - var dialog = Sunstone.getDialog(OVERCOMMIT_DIALOG_ID); - - dialog.setParams( - { element: that.element, - action : "Host.append_template", - resourceName : Locale.tr("Host"), - tabId : TAB_ID - }); - - dialog.show(); - return false; - }); - //.off and .on prevent multiple clicks events $(document).off('click', '.update_reserved').on("click", '.update_reserved', function(){ var reservedCPU = parseInt(document.getElementById('change_bar_cpu').value); diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js index 7170801aeb..04e189632e 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js @@ -76,21 +76,23 @@ define(function(require) { data: { id: this.element.ID, monitor: { - monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU,HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM" + monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU,HOST_SHARE/TOTAL_CPU,HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM,HOST_SHARE/TOTAL_MEM" } }, success: function(req, response) { + console.log(response); var host_graphs = [ { - monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU", - labels : Locale.tr("Allocated") + "," + Locale.tr("Real") + "," + Locale.tr("Total"), + monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU,HOST_SHARE/TOTAL_CPU", + labels : Locale.tr("Allocated") + "," + Locale.tr("Real") + "," + Locale.tr("Total") + "," + Locale.tr("Total +/- reserved"), humanize_figures : false, div_graph : $("#host_cpu_graph"), div_legend : $("#host_cpu_legend") }, { - monitor_resources : "HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM", - labels : Locale.tr("Allocated") + "," + Locale.tr("Real") + "," + Locale.tr("Total"), + monitor_resources : "HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM,HOST_SHARE/TOTAL_MEM", + labels : Locale.tr("Allocated") + "," + Locale.tr("Real") + "," + Locale.tr("Total") + "," + Locale.tr("Total +/- reserved"), + humanize_figures : false, humanize_figures : true, div_graph : $("#host_mem_graph"), div_legend : $("#host_mem_legend") From db77193ce24675d73e538169cc248a0767135799 Mon Sep 17 00:00:00 2001 From: juanmont Date: Tue, 15 Nov 2016 15:50:19 +0100 Subject: [PATCH 3/5] F #4901 changed labels in hosts-tabs and changed colors inputs --- .../app/tabs/clusters-tab/panels/info.js | 4 +- .../public/app/tabs/hosts-tab/panels/info.js | 39 +++++++------------ .../app/tabs/hosts-tab/panels/info/html.hbs | 6 +-- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js index 22fee8f2e1..6b7b038d4e 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js @@ -83,9 +83,9 @@ define(function(require) { RESOURCE, Locale.tr("Attributes")); var reservedMem; - (this.element.TEMPLATE.RESERVED_MEM != "0%")?reservedMem = parseInt(this.element.TEMPLATE.RESERVED_MEM): reservedMem = 0; + (this.element.TEMPLATE.RESERVED_MEM != "0%" && this.element.TEMPLATE.RESERVED_MEM != "")?reservedMem = parseInt(this.element.TEMPLATE.RESERVED_MEM): reservedMem = 0; var reservedCPU - (this.element.TEMPLATE.RESERVED_CPU != "0%")? reservedCPU = parseInt(this.element.TEMPLATE.RESERVED_CPU): reservedCPU = 0; + (this.element.TEMPLATE.RESERVED_CPU != "0%" && this.element.TEMPLATE.RESERVED_CPU != "")? reservedCPU = parseInt(this.element.TEMPLATE.RESERVED_CPU): reservedCPU = 0; return TemplateHTML({ 'element': this.element, 'renameTrHTML': renameTrHTML, diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js index 91f6831b01..e73e7b1713 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js @@ -92,7 +92,6 @@ define(function(require) { this.strippedTemplate, RESOURCE, Locale.tr("Attributes")); - console.log(this.element); var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME); var clusterTrHTML = ClusterTr.html(this.element.CLUSTER); var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element); @@ -101,7 +100,6 @@ define(function(require) { var datastoresCapacityTableHTML = DatastoresCapacityTable.html(this.element); var realCPU = parseInt(this.element.HOST_SHARE.TOTAL_CPU); var realMEM = parseInt(this.element.HOST_SHARE.TOTAL_MEM); - return TemplateInfo({ 'element': this.element, @@ -121,26 +119,10 @@ define(function(require) { }); } - function changeBarCPU(){ - if(parseInt(document.getElementById('change_bar_cpu').value) > this.element.HOST_SHARE.TOTAL_CPU) - document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; - if(parseInt(document.getElementById('change_bar_cpu').value) < this.element.HOST_SHARE.TOTAL_CPU) - document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; - document.getElementById('textInput_reserved_cpu').value = document.getElementById('change_bar_cpu').value; - } - function changeInputCPU(){ document.getElementById('change_bar_cpu').value = document.getElementById('textInput_reserved_cpu').value; } - - function changeBarMEM(){ - if(parseInt(document.getElementById('change_bar_mem').value) > this.element.HOST_SHARE.TOTAL_MEM) - document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; - if(parseInt(document.getElementById('change_bar_mem').value) < this.element.HOST_SHARE.TOTAL_MEM) - document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; - document.getElementById('textInput_reserved_mem').value = Humanize.size(parseInt(document.getElementById('change_bar_mem').value)); - } - + function changeInputMEM(){ document.getElementById('change_bar_mem').value = parseInt(document.getElementById('textInput_reserved_mem').value); } @@ -170,12 +152,21 @@ define(function(require) { Sunstone.runAction("Host.append_template", that.element.ID, TemplateUtils.templateToString(obj)); }); - - document.getElementById("change_bar_cpu").addEventListener("change", changeBarCPU); + document.getElementById("change_bar_cpu").addEventListener("change", function(){ + if(parseInt(document.getElementById('change_bar_cpu').value) > that.element.HOST_SHARE.TOTAL_CPU) + document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_cpu').value) < that.element.HOST_SHARE.TOTAL_CPU) + document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; + document.getElementById('textInput_reserved_cpu').value = document.getElementById('change_bar_cpu').value; + }); document.getElementById("textInput_reserved_cpu").addEventListener("change", changeInputCPU); - document.getElementById("change_bar_mem").addEventListener("change", changeBarMEM); + document.getElementById("change_bar_mem").addEventListener("change", function(){ + if(parseInt(document.getElementById('change_bar_mem').value) > that.element.HOST_SHARE.TOTAL_MEM) + document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_mem').value) < that.element.HOST_SHARE.TOTAL_MEM) + document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; + document.getElementById('textInput_reserved_mem').value = Humanize.size(parseInt(document.getElementById('change_bar_mem').value)); + }); document.getElementById("textInput_reserved_mem").addEventListener("change", changeInputMEM); - - return false; } }); diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs index 819b54698c..2c1662d64c 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs @@ -92,13 +92,13 @@ - {{tr "Reserved CPU"}} - + {{tr "CPU"}} + - {{tr "Reserved Memory"}} + {{tr "Memory"}} From 949e7e2f5ce34e27e32d184e9cb180a68f64117a Mon Sep 17 00:00:00 2001 From: juanmont Date: Tue, 15 Nov 2016 15:54:13 +0100 Subject: [PATCH 4/5] removed console.logs --- src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js index 04e189632e..c5e5f91d90 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js @@ -80,7 +80,6 @@ define(function(require) { } }, success: function(req, response) { - console.log(response); var host_graphs = [ { monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU,HOST_SHARE/TOTAL_CPU", From 90675e78152690f5c3aac99f6442e4d66827f584 Mon Sep 17 00:00:00 2001 From: juanmont Date: Tue, 15 Nov 2016 17:29:24 +0100 Subject: [PATCH 5/5] Solved the problem of freezing the slider in hosts-tab --- .../tabs/clusters-tab/panels/info/html.hbs | 4 +- .../public/app/tabs/hosts-tab/panels/info.js | 38 +++++++++---------- .../app/tabs/hosts-tab/panels/info/html.hbs | 10 ++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs index 8cf496f1eb..5499fd5c83 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs @@ -48,13 +48,13 @@ - + {{tr "Reserved CPU"}} - + {{tr "Reserved Memory"}} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js index e73e7b1713..0da79fd82c 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js @@ -120,11 +120,11 @@ define(function(require) { } function changeInputCPU(){ - document.getElementById('change_bar_cpu').value = document.getElementById('textInput_reserved_cpu').value; + document.getElementById('change_bar_cpu_hosts').value = document.getElementById('textInput_reserved_cpu_hosts').value; } function changeInputMEM(){ - document.getElementById('change_bar_mem').value = parseInt(document.getElementById('textInput_reserved_mem').value); + document.getElementById('change_bar_mem_hosts').value = parseInt(document.getElementById('textInput_reserved_mem_hosts').value); } function _setup(context) { @@ -136,10 +136,10 @@ define(function(require) { PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context); //.off and .on prevent multiple clicks events - $(document).off('click', '.update_reserved').on("click", '.update_reserved', function(){ - var reservedCPU = parseInt(document.getElementById('change_bar_cpu').value); + $(document).off('click', '.update_reserved_hosts').on("click", '.update_reserved', function(){ + var reservedCPU = parseInt(document.getElementById('change_bar_cpu_hosts').value); var CPU = parseInt(that.element.HOST_SHARE.FREE_CPU); - var reservedMem = parseInt(document.getElementById('change_bar_mem').value); + var reservedMem = parseInt(document.getElementById('change_bar_mem_hosts').value); var MEM = parseInt(that.element.HOST_SHARE.FREE_MEM); if(parseInt(that.element.HOST_SHARE.USED_CPU) > 0) CPU += parseInt(that.element.HOST_SHARE.USED_CPU); @@ -152,21 +152,21 @@ define(function(require) { Sunstone.runAction("Host.append_template", that.element.ID, TemplateUtils.templateToString(obj)); }); - document.getElementById("change_bar_cpu").addEventListener("change", function(){ - if(parseInt(document.getElementById('change_bar_cpu').value) > that.element.HOST_SHARE.TOTAL_CPU) - document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; - if(parseInt(document.getElementById('change_bar_cpu').value) < that.element.HOST_SHARE.TOTAL_CPU) - document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; - document.getElementById('textInput_reserved_cpu').value = document.getElementById('change_bar_cpu').value; + document.getElementById("change_bar_cpu_hosts").addEventListener("change", function(){ + if(parseInt(document.getElementById('change_bar_cpu_hosts').value) > that.element.HOST_SHARE.TOTAL_CPU) + document.getElementById('textInput_reserved_cpu_hosts').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_cpu_hosts').value) < that.element.HOST_SHARE.TOTAL_CPU) + document.getElementById('textInput_reserved_cpu_hosts').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; + document.getElementById('textInput_reserved_cpu_hosts').value = document.getElementById('change_bar_cpu_hosts').value; }); - document.getElementById("textInput_reserved_cpu").addEventListener("change", changeInputCPU); - document.getElementById("change_bar_mem").addEventListener("change", function(){ - if(parseInt(document.getElementById('change_bar_mem').value) > that.element.HOST_SHARE.TOTAL_MEM) - document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; - if(parseInt(document.getElementById('change_bar_mem').value) < that.element.HOST_SHARE.TOTAL_MEM) - document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; - document.getElementById('textInput_reserved_mem').value = Humanize.size(parseInt(document.getElementById('change_bar_mem').value)); + document.getElementById("textInput_reserved_cpu_hosts").addEventListener("change", changeInputCPU); + document.getElementById("change_bar_mem_hosts").addEventListener("change", function(){ + if(parseInt(document.getElementById('change_bar_mem_hosts').value) > that.element.HOST_SHARE.TOTAL_MEM) + document.getElementById('textInput_reserved_mem_hosts').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_mem_hosts').value) < that.element.HOST_SHARE.TOTAL_MEM) + document.getElementById('textInput_reserved_mem_hosts').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; + document.getElementById('textInput_reserved_mem_hosts').value = Humanize.size(parseInt(document.getElementById('change_bar_mem_hosts').value)); }); - document.getElementById("textInput_reserved_mem").addEventListener("change", changeInputMEM); + document.getElementById("textInput_reserved_mem_hosts").addEventListener("change", changeInputMEM); } }); diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs index 2c1662d64c..7ff53d2194 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs @@ -83,7 +83,7 @@ {{tr "Overcommitment"}} - @@ -93,15 +93,15 @@ {{tr "CPU"}} - + - + {{tr "Memory"}} - + - +