Feature #1664: Show user quotas in fancy progress bars, and use default limits

This commit is contained in:
Carlos Martín committed 2013-03-01 12:55:13 +01:00
1 parent 585c214af3
commit be58d031dc
3 files changed
+252 -21

No files matched your search

+90 -1
View File
@@ -777,7 +777,96 @@ var OpenNebula = {
OpenNebula.Action.del(params,OpenNebula.User.resource);
},
"list": function(params){
OpenNebula.Action.list(params,OpenNebula.User.resource);
var resource = OpenNebula.User.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 user quotas
default_user_quotas = response.USER_POOL.DEFAULT_USER_QUOTAS;
// Initialize the VM_QUOTA to unlimited if it does not exist
if ($.isEmptyObject(default_user_quotas.VM_QUOTA)){
default_user_quotas.VM_QUOTA = {
"VM" : {
"VMS" : "0",
"MEMORY" : "0",
"CPU" : "0"
}
}
}
// Replace the DATASTORE array with a map
var ds_quotas = [];
if ($.isArray(default_user_quotas.DATASTORE_QUOTA.DATASTORE))
ds_quotas = default_user_quotas.DATASTORE_QUOTA.DATASTORE;
else if (default_user_quotas.DATASTORE_QUOTA.DATASTORE)
ds_quotas = [default_user_quotas.DATASTORE_QUOTA.DATASTORE];
delete default_user_quotas.DATASTORE_QUOTA;
default_user_quotas.DATASTORE_QUOTA = {};
for (var i=0; i < ds_quotas.length; i++){
default_user_quotas.DATASTORE_QUOTA[ds_quotas[i].ID] = ds_quotas[i]
}
// Replace the IMAGE array with a map
var img_quotas = [];
if ($.isArray(default_user_quotas.IMAGE_QUOTA.IMAGE))
img_quotas = default_user_quotas.IMAGE_QUOTA.IMAGE;
else if (default_user_quotas.IMAGE_QUOTA.IMAGE)
img_quotas = [default_user_quotas.IMAGE_QUOTA.IMAGE];
delete default_user_quotas.IMAGE_QUOTA;
default_user_quotas.IMAGE_QUOTA = {};
for (var i=0; i < img_quotas.length; i++){
default_user_quotas.IMAGE_QUOTA[img_quotas[i].ID] = img_quotas[i]
}
// Replace the NETWORK array with a map
var net_quotas = [];
if ($.isArray(default_user_quotas.NETWORK_QUOTA.NETWORK))
net_quotas = default_user_quotas.NETWORK_QUOTA.NETWORK;
else if (default_user_quotas.NETWORK_QUOTA.NETWORK)
net_quotas = [default_user_quotas.NETWORK_QUOTA.NETWORK];
delete default_user_quotas.NETWORK_QUOTA;
default_user_quotas.NETWORK_QUOTA = {};
for (var i=0; i < net_quotas.length; i++){
default_user_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;
}
});
},
"show" : function(params){
OpenNebula.Action.show(params,OpenNebula.User.resource);
+85 -20
View File
@@ -506,12 +506,21 @@ function userElementArray(user_json){
var cpu = "-";
if (!$.isEmptyObject(user.VM_QUOTA)){
vms = user.VM_QUOTA.VM.VMS_USED+' / '
+user.VM_QUOTA.VM.VMS;
memory = humanize_size(user.VM_QUOTA.VM.MEMORY_USED * 1024)+' / '
+humanize_size(user.VM_QUOTA.VM.MEMORY * 1024);
cpu = user.VM_QUOTA.VM.CPU_USED+' / '
+user.VM_QUOTA.VM.CPU;
var vms = quotaBar(
user.VM_QUOTA.VM.VMS_USED,
user.VM_QUOTA.VM.VMS,
default_user_quotas.VM_QUOTA.VM.VMS);
var memory = quotaBarMB(
user.VM_QUOTA.VM.MEMORY_USED,
user.VM_QUOTA.VM.MEMORY,
default_user_quotas.VM_QUOTA.VM.MEMORY);
var cpu = quotaBarFloat(
user.VM_QUOTA.VM.CPU_USED,
user.VM_QUOTA.VM.CPU,
default_user_quotas.VM_QUOTA.VM.CPU);
}
@@ -609,6 +618,21 @@ function updateUserInfo(request,user){
var quotas_tab_html = '';
if (!$.isEmptyObject(user_info.VM_QUOTA)){
var vms_bar = quotaBar(
user_info.VM_QUOTA.VM.VMS_USED,
user_info.VM_QUOTA.VM.VMS,
default_user_quotas.VM_QUOTA.VM.VMS);
var memory_bar = quotaBarMB(
user_info.VM_QUOTA.VM.MEMORY_USED,
user_info.VM_QUOTA.VM.MEMORY,
default_user_quotas.VM_QUOTA.VM.MEMORY);
var cpu_bar = quotaBarFloat(
user_info.VM_QUOTA.VM.CPU_USED,
user_info.VM_QUOTA.VM.CPU,
default_user_quotas.VM_QUOTA.VM.CPU);
quotas_tab_html +=
'<table class="twelve">\
<thead>\
@@ -620,12 +644,9 @@ function updateUserInfo(request,user){
</thead>\
<tbody>\
<tr>\
<td>'+user_info.VM_QUOTA.VM.VMS_USED+' / '
+user_info.VM_QUOTA.VM.VMS+'</td>\
<td>'+humanize_size(user_info.VM_QUOTA.VM.MEMORY_USED * 1024)+' / '
+humanize_size(user_info.VM_QUOTA.VM.MEMORY * 1024)+'</td>\
<td>'+user_info.VM_QUOTA.VM.CPU_USED+' / '
+user_info.VM_QUOTA.VM.CPU+'</td>\
<td>'+vms_bar+'</td>\
<td>'+memory_bar+'</td>\
<td>'+cpu_bar+'</td>\
</tr>\
</tbody>\
</table>'
@@ -651,13 +672,31 @@ function updateUserInfo(request,user){
ds_quotas = [user_info.DATASTORE_QUOTA.DATASTORE];
for (var i=0; i < ds_quotas.length; i++){
var default_ds_quotas = default_user_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);
quotas_tab_html +=
'<tr>\
<td>'+ds_quotas[i].ID+'</td>\
<td>'+ds_quotas[i].IMAGES_USED+' / '
+ds_quotas[i].IMAGES+'</td>\
<td>'+humanize_size(ds_quotas[i].SIZE_USED * 1024)+' / '
+humanize_size(ds_quotas[i].SIZE * 1024)+'</td>\
<td>'+img_bar+'</td>\
<td>'+size_bar+'</td>\
</tr>';
}
@@ -685,11 +724,24 @@ function updateUserInfo(request,user){
img_quotas = [user_info.IMAGE_QUOTA.IMAGE];
for (var i=0; i < img_quotas.length; i++){
var default_img_quotas = default_user_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);
quotas_tab_html +=
'<tr>\
<td>'+img_quotas[i].ID+'</td>\
<td>'+img_quotas[i].RVMS_USED+' / '
+img_quotas[i].RVMS+'</td>\
<td>'+rvms_bar+'</td>\
</tr>';
}
@@ -717,11 +769,24 @@ function updateUserInfo(request,user){
net_quotas = [user_info.NETWORK_QUOTA.NETWORK];
for (var i=0; i < net_quotas.length; i++){
var default_net_quotas = default_user_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);
quotas_tab_html +=
'<tr>\
<td>'+net_quotas[i].ID+'</td>\
<td>'+net_quotas[i].LEASES_USED+' / '
+net_quotas[i].LEASES+'</td>\
<td>'+leases_bar+'</td>\
</tr>';
}
+77
View File
@@ -1936,6 +1936,83 @@ function insert_cluster_dropdown(resource_type, resource_id, cluster_value, clus
return str;
}
/*
* Helpers for quotas
*/
function quotaBar(usage, limit, default_limit){
var int_usage = parseInt(usage, 10);
var int_limit = quotaIntLimit(limit, default_limit);
return quotaBarHtml(int_usage, int_limit);
}
function quotaBarMB(usage, limit, default_limit){
var int_usage = parseInt(usage, 10);
var int_limit = quotaIntLimit(limit, default_limit);
info_str = humanize_size(int_usage * 1024)+' / '
+((int_limit > 0) ? humanize_size(int_limit * 1024) : '-')
return quotaBarHtml(int_usage, int_limit, info_str);
}
function quotaBarFloat(usage, limit, default_limit){
var float_usage = parseFloat(usage, 10);
var float_limit = quotaFloatLimit(limit, default_limit);
return quotaBarHtml(float_usage, float_limit);
}
function quotaBarHtml(usage, limit, info_str){
percentage = 0;
if (limit > 0){
percentage = (usage / limit) * 100;
if (percentage > 100){
percentage = 100;
}
}
info_str = info_str || ( usage+' / '+((limit > 0) ? limit : '-') );
html = '<div class="progress"><span class="meter" style="width: '
+percentage+'%"></span>'+info_str+'</div>';
return html;
}
function quotaIntLimit(limit, default_limit){
i_limit = parseInt(limit, 10);
i_default_limit = parseInt(default_limit, 10);
if (i_limit == -1){
i_limit = i_default_limit;
}
if (isNaN(i_limit))
{
i_limit = 0;
}
return i_limit
}
function quotaFloatLimit(limit, default_limit){
f_limit = parseFloat(limit, 10);
f_default_limit = parseFloat(default_limit, 10);
if (f_limit == -1){
f_limit = f_default_limit;
}
if (isNaN(f_limit))
{
f_limit = 0;
}
return f_limit
}
/*
* jQuery Foundation Tooltips 2.0.2
* http://foundation.zurb.com