Updated Branches: refs/heads/Commit-Ratio 215621daa -> ab24e8419
Cpu and Memory overcommit ratio Ui integration Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ab24e841 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ab24e841 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ab24e841 Branch: refs/heads/Commit-Ratio Commit: ab24e84191e115b0b8fe9a40f9cdeb6892a083ac Parents: 215621d Author: Pranav Saxena <[email protected]> Authored: Fri Feb 22 18:06:59 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Fri Feb 22 18:06:59 2013 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ab24e841/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index d76aa3e..87052c3 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7446,7 +7446,7 @@ }, - ramovercommit:{ + memoryovercommit:{ label: 'RAM overcommit ratio', defaultValue:'1' @@ -7513,8 +7513,8 @@ if(args.data.cpuovercommit != "") array1.push("&cpuovercommitratio=" + todb(args.data.cpuovercommit)); - if(args.data.ramovercommit != "") - array1.push("&ramovercommitratio=" + todb(args.data.ramovercommit)); + if(args.data.memoryovercommit != "") + array1.push("&memoryovercommitratio=" + todb(args.data.memoryovercommit)); if(args.data.hypervisor == "VMware") { array1.push("&username=" + todb(args.data.vCenterUsername)); @@ -7600,8 +7600,8 @@ if (args.data.cpuovercommitratio != "" && args.data.cpuovercommitratio > 0) array1.push("&cpuovercommitratio=" + args.data.cpuovercommitratio); - if (args.data.ramovercommitratio != "" && args.data.ramovercommitratio > 0) - array1.push("&ramovercommitratio=" + args.data.ramovercommitratio); + if (args.data.memoryovercommitratio != "" && args.data.memoryovercommitratio > 0) + array1.push("&memoryovercommitratio=" + args.data.memoryovercommitratio); $.ajax({ @@ -7611,7 +7611,7 @@ success: function(json) { var item = json.updateclusterresponse.cluster; args.context.clusters[0].cpuovercommitratio = item.cpuovercommitratio; - args.context.clusters[0].ramovercommitratio = item.ramovercommitratio; + args.context.clusters[0].memoryovercommitratio = item.memoryovercommitratio; addExtraPropertiesToClusterObject(item); args.response.success({ actionFilter: clusterActionfilter, @@ -7793,7 +7793,7 @@ hypervisortype: { label: 'label.hypervisor' }, clustertype: { label: 'label.cluster.type' }, cpuovercommitratio:{ label: 'CPU overcommit Ratio', isEditable:true}, - ramovercommitratio:{ label: 'RAM overcommit Ratio', isEditable:true}, + memoryovercommitratio:{ label: 'Memory overcommit Ratio', isEditable:true}, //allocationstate: { label: 'label.allocation.state' }, //managedstate: { label: 'Managed State' }, state: { label: 'label.state' }
