etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CPU&RAM overcommit ratio uI integration code

This commit is contained in:
Pranav Saxena 2013-02-16 22:01:43 +05:30
parent 2beb66fd32
commit 215621daa8
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ui/scripts/system.js
View File

@ -7440,6 +7440,18 @@
validation: { required: true }
},
cpuovercommit:{
label: 'CPU overcommit ratio',
defaultValue:'1'
},
ramovercommit:{
label: 'RAM overcommit ratio',
defaultValue:'1'
},
//hypervisor==VMWare begins here
vCenterHost: {
label: 'label.vcenter.host',
@ -7497,6 +7509,13 @@
array1.push("&podId=" + args.data.podId);
var clusterName = args.data.name;
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.hypervisor == "VMware") {
array1.push("&username=" + todb(args.data.vCenterUsername));
array1.push("&password=" + todb(args.data.vCenterPassword));
@ -7572,6 +7591,38 @@
},
actions: {
edit: {
label: 'label.edit',
action: function(args) {
var array1 = [];
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);
$.ajax({
url: createURL("updateCluster&id=" + args.context.clusters[0].id + array1.join("")),
dataType: "json",
async: true,
success: function(json) {
var item = json.updateclusterresponse.cluster;
args.context.clusters[0].cpuovercommitratio = item.cpuovercommitratio;
args.context.clusters[0].ramovercommitratio = item.ramovercommitratio;
addExtraPropertiesToClusterObject(item);
args.response.success({
actionFilter: clusterActionfilter,
data:item
});
}
});
}
},
enable: {
label: 'label.action.enable.cluster',
messages: {
@ -7741,6 +7792,8 @@
podname: { label: 'label.pod' },
hypervisortype: { label: 'label.hypervisor' },
clustertype: { label: 'label.cluster.type' },
cpuovercommitratio:{ label: 'CPU overcommit Ratio', isEditable:true},
ramovercommitratio:{ label: 'RAM overcommit Ratio', isEditable:true},
//allocationstate: { label: 'label.allocation.state' },
//managedstate: { label: 'Managed State' },
state: { label: 'label.state' }
@ -10407,10 +10460,14 @@
if(jsonObj.state == "Enabled") {//managed, allocation enabled
allowedActions.push("unmanage");
allowedActions.push("disable");
allowedActions.push("edit");
}
else if(jsonObj.state == "Disabled") { //managed, allocation disabled
allowedActions.push("unmanage");
allowedActions.push("enable");
allowedActions.push("edit");
}
else { //Unmanaged, PrepareUnmanaged , PrepareUnmanagedError
allowedActions.push("manage");