Feature #1664: Group quotas are shown as progress bars

This commit is contained in:
Carlos Martín committed 2013-03-01 15:28:44 +01:00
1 parent d04b77a258
commit 78fc4b07e3
2 files changed
+281 -22

No files matched your search

+90 -1
View File
@@ -753,7 +753,96 @@ var OpenNebula = {
OpenNebula.Action.del(params,OpenNebula.Group.resource);
},
"list": function(params){
OpenNebula.Action.list(params,OpenNebula.Group.resource);
var resource = OpenNebula.Group.resource
var req_path = resource.toLowerCase();
var callback = params.success;
var callback_error = params.error;
var timeout = params.timeout || false;
var request = OpenNebula.Helper.request(resource,"list");
$.ajax({
url: req_path,
type: "GET",
data: {timeout: timeout},
dataType: "json",
success: function(response){
// Get the default group quotas
default_group_quotas = response.GROUP_POOL.DEFAULT_GROUP_QUOTAS;
// Initialize the VM_QUOTA to unlimited if it does not exist
if ($.isEmptyObject(default_group_quotas.VM_QUOTA)){
default_group_quotas.VM_QUOTA = {
"VM" : {
"VMS" : "0",
"MEMORY" : "0",
"CPU" : "0"
}
}
}
// Replace the DATASTORE array with a map
var ds_quotas = [];
if ($.isArray(default_group_quotas.DATASTORE_QUOTA.DATASTORE))
ds_quotas = default_group_quotas.DATASTORE_QUOTA.DATASTORE;
else if (default_group_quotas.DATASTORE_QUOTA.DATASTORE)
ds_quotas = [default_group_quotas.DATASTORE_QUOTA.DATASTORE];
delete default_group_quotas.DATASTORE_QUOTA;
default_group_quotas.DATASTORE_QUOTA = {};
for (var i=0; i < ds_quotas.length; i++){
default_group_quotas.DATASTORE_QUOTA[ds_quotas[i].ID] = ds_quotas[i]
}
// Replace the IMAGE array with a map
var img_quotas = [];
if ($.isArray(default_group_quotas.IMAGE_QUOTA.IMAGE))
img_quotas = default_group_quotas.IMAGE_QUOTA.IMAGE;
else if (default_group_quotas.IMAGE_QUOTA.IMAGE)
img_quotas = [default_group_quotas.IMAGE_QUOTA.IMAGE];
delete default_group_quotas.IMAGE_QUOTA;
default_group_quotas.IMAGE_QUOTA = {};
for (var i=0; i < img_quotas.length; i++){
default_group_quotas.IMAGE_QUOTA[img_quotas[i].ID] = img_quotas[i]
}
// Replace the NETWORK array with a map
var net_quotas = [];
if ($.isArray(default_group_quotas.NETWORK_QUOTA.NETWORK))
net_quotas = default_group_quotas.NETWORK_QUOTA.NETWORK;
else if (default_group_quotas.NETWORK_QUOTA.NETWORK)
net_quotas = [default_group_quotas.NETWORK_QUOTA.NETWORK];
delete default_group_quotas.NETWORK_QUOTA;
default_group_quotas.NETWORK_QUOTA = {};
for (var i=0; i < net_quotas.length; i++){
default_group_quotas.NETWORK_QUOTA[net_quotas[i].ID] = net_quotas[i]
}
var list = OpenNebula.Helper.pool(resource,response)
return callback ?
callback(request, list) : null;
},
error: function(response)
{
return callback_error ?
callback_error(request, OpenNebula.Error(response)) : null;
}
});
},
"set_quota" : function(params){
var action_obj = { quotas : params.data.extra_param };
+191 -21
View File
@@ -68,8 +68,8 @@ var groups_tab_content = '\
<th>'+tr("Name")+'</th>\
<th>'+tr("Users")+'</th>\
<th>'+tr("VMs")+'</th>\
<th>'+tr("UMEM")+'</th>\
<th>'+tr("UCPU")+'</th>\
<th>'+tr("Memory")+'</th>\
<th>'+tr("CPU")+'</th>\
</tr>\
</thead>\
<tbody id="tbodygroups">\
@@ -394,9 +394,20 @@ function groupElementArray(group_json){
var cpu = "-";
if (!$.isEmptyObject(group.VM_QUOTA)){
vms = group.VM_QUOTA.VM.VMS_USED;
memory = group.VM_QUOTA.VM.MEMORY_USED+' MB';
cpu = group.VM_QUOTA.VM.CPU_USED;
var vms = quotaBar(
group.VM_QUOTA.VM.VMS_USED,
group.VM_QUOTA.VM.VMS,
default_group_quotas.VM_QUOTA.VM.VMS);
var memory = quotaBarMB(
group.VM_QUOTA.VM.MEMORY_USED,
group.VM_QUOTA.VM.MEMORY,
default_group_quotas.VM_QUOTA.VM.MEMORY);
var cpu = quotaBarFloat(
group.VM_QUOTA.VM.CPU_USED,
group.VM_QUOTA.VM.CPU,
default_group_quotas.VM_QUOTA.VM.CPU);
}
return [
@@ -482,25 +493,184 @@ function updateGroupInfo(request,group){
</div>\
</div>';
if (!$.isEmptyObject(info.VM_QUOTA))
info_tab_html += '<table class="info_table" style="width:70%;margin-top:0;margin-left:40px;">\
<tbody>'+prettyPrintJSON(info.VM_QUOTA)+'</tbody>\
</table>'
if (!$.isEmptyObject(info.VM_QUOTA)){
var vms_bar = quotaBar(
info.VM_QUOTA.VM.VMS_USED,
info.VM_QUOTA.VM.VMS,
default_group_quotas.VM_QUOTA.VM.VMS);
if (!$.isEmptyObject(info.DATASTORE_QUOTA))
info_tab_html += '<table class="info_table" style="width:70%;margin-top:0;margin-left:40px;%">\
<tbody>'+prettyPrintJSON(info.DATASTORE_QUOTA)+'</tbody>\
</table>'
var memory_bar = quotaBarMB(
info.VM_QUOTA.VM.MEMORY_USED,
info.VM_QUOTA.VM.MEMORY,
default_group_quotas.VM_QUOTA.VM.MEMORY);
if (!$.isEmptyObject(info.IMAGE_QUOTA))
info_tab_html += '<table class="info_table" style="width:70%;margin-top:0;margin-left:40px;">\
<tbody>'+prettyPrintJSON(info.IMAGE_QUOTA)+'</tbody>\
</table>';
var cpu_bar = quotaBarFloat(
info.VM_QUOTA.VM.CPU_USED,
info.VM_QUOTA.VM.CPU,
default_group_quotas.VM_QUOTA.VM.CPU);
if (!$.isEmptyObject(info.NETWORK_QUOTA))
info_tab_html += '<table class="info_table" style="width:70%;margin-top:0;margin-left:40px;">\
<tbody>'+prettyPrintJSON(info.NETWORK_QUOTA)+'</tbody>\
</table>';
info_tab_html +=
'<table class="twelve">\
<thead>\
<tr>\
<th>'+tr("VMs")+'</th>\
<th>'+tr("Memory")+'</th>\
<th>'+tr("CPU")+'</th>\
</tr>\
</thead>\
<tbody>\
<tr>\
<td>'+vms_bar+'</td>\
<td>'+memory_bar+'</td>\
<td>'+cpu_bar+'</td>\
</tr>\
</tbody>\
</table>'
}
if (!$.isEmptyObject(info.DATASTORE_QUOTA)){
info_tab_html +=
'<table class="twelve">\
<thead>\
<tr>\
<th>'+tr("Datastore ID")+'</th>\
<th>'+tr("Images")+'</th>\
<th>'+tr("Size")+'</th>\
</tr>\
</thead>\
<tbody>';
var ds_quotas = [];
if ($.isArray(info.DATASTORE_QUOTA.DATASTORE))
ds_quotas = info.DATASTORE_QUOTA.DATASTORE;
else if (info.DATASTORE_QUOTA.DATASTORE.ID)
ds_quotas = [info.DATASTORE_QUOTA.DATASTORE];
for (var i=0; i < ds_quotas.length; i++){
var default_ds_quotas = default_group_quotas.DATASTORE_QUOTA[ds_quotas[i].ID]
if (default_ds_quotas == undefined){
default_ds_quotas = {
"IMAGES" : "0",
"SIZE" : "0"
}
}
var img_bar = quotaBar(
ds_quotas[i].IMAGES_USED,
ds_quotas[i].IMAGES,
default_ds_quotas.IMAGES);
var size_bar = quotaBarMB(
ds_quotas[i].SIZE_USED,
ds_quotas[i].SIZE,
default_ds_quotas.SIZE);
info_tab_html +=
'<tr>\
<td>'+ds_quotas[i].ID+'</td>\
<td>'+img_bar+'</td>\
<td>'+size_bar+'</td>\
</tr>';
}
info_tab_html +=
'</tbody>\
</table>';
}
if (!$.isEmptyObject(info.IMAGE_QUOTA)){
info_tab_html +=
'<table class="twelve">\
<thead>\
<tr>\
<th>'+tr("Image ID")+'</th>\
<th>'+tr("Running VMs")+'</th>\
</tr>\
</thead>\
<tbody>';
var img_quotas = [];
if ($.isArray(info.IMAGE_QUOTA.IMAGE))
img_quotas = info.IMAGE_QUOTA.IMAGE;
else if (info.IMAGE_QUOTA.IMAGE.ID)
img_quotas = [info.IMAGE_QUOTA.IMAGE];
for (var i=0; i < img_quotas.length; i++){
var default_img_quotas = default_group_quotas.IMAGE_QUOTA[img_quotas[i].ID]
if (default_img_quotas == undefined){
default_img_quotas = {
"RVMS" : "0"
}
}
var rvms_bar = quotaBar(
img_quotas[i].RVMS_USED,
img_quotas[i].RVMS,
default_img_quotas.RVMS);
info_tab_html +=
'<tr>\
<td>'+img_quotas[i].ID+'</td>\
<td>'+rvms_bar+'</td>\
</tr>';
}
info_tab_html +=
'</tbody>\
</table>';
}
if (!$.isEmptyObject(info.NETWORK_QUOTA)){
info_tab_html +=
'<table class="twelve">\
<thead>\
<tr>\
<th>'+tr("Network ID")+'</th>\
<th>'+tr("Leases")+'</th>\
</tr>\
</thead>\
<tbody>';
var net_quotas = [];
if ($.isArray(info.NETWORK_QUOTA.NETWORK))
net_quotas = info.NETWORK_QUOTA.NETWORK;
else if (info.NETWORK_QUOTA.NETWORK.ID)
net_quotas = [info.NETWORK_QUOTA.NETWORK];
for (var i=0; i < net_quotas.length; i++){
var default_net_quotas = default_group_quotas.NETWORK_QUOTA[net_quotas[i].ID]
if (default_net_quotas == undefined){
default_net_quotas = {
"LEASES" : "0"
}
}
var leases_bar = quotaBar(
net_quotas[i].LEASES_USED,
net_quotas[i].LEASES,
default_net_quotas.LEASES);
info_tab_html +=
'<tr>\
<td>'+net_quotas[i].ID+'</td>\
<td>'+leases_bar+'</td>\
</tr>';
}
info_tab_html +=
'</tbody>\
</table>';
}
var info_tab = {
title : tr("Group information"),