shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Feature #1612: Add VOLATILE_SIZE quota to Sunstone

Browse Source
This commit is contained in:
Carlos Martín 2013-10-09 13:27:23 +02:00
parent b048c2973b
commit 7e2507e86f
4 changed files with 66 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/public/js/plugins/config-tab.js
View File

@ -360,6 +360,7 @@ function updateUserConfigInfo(request,user_json) {
var quotas_tab_html = Quotas.vms(info, default_user_quotas);
quotas_tab_html += Quotas.cpu(info, default_user_quotas);
quotas_tab_html += Quotas.memory(info, default_user_quotas);
quotas_tab_html += Quotas.volatile_size(info, default_user_quotas);
quotas_tab_html += Quotas.image(info, default_user_quotas);
quotas_tab_html += Quotas.network(info, default_user_quotas);
quotas_tab_html += Quotas.datastore(info, default_user_quotas);
@ -456,6 +457,7 @@ function fillGroupQuotas(group_id){
var quotas_tab_html = Quotas.vms(info, default_group_quotas);
quotas_tab_html += Quotas.cpu(info, default_group_quotas);
quotas_tab_html += Quotas.memory(info, default_group_quotas);
quotas_tab_html += Quotas.volatile_size(info, default_group_quotas);
quotas_tab_html += Quotas.image(info, default_group_quotas);
quotas_tab_html += Quotas.network(info, default_group_quotas);
quotas_tab_html += Quotas.datastore(info, default_group_quotas);

30
src/sunstone/public/js/plugins/groups-tab.js
View File

@ -133,10 +133,10 @@ var group_quotas_tmpl = '<div class="panel">\
<hr>\
<div id="vm_quota">\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="inline right" >'+tr("Max VMs")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="VMS"></input>\
</div>\
<div class="one columns">\
@ -144,10 +144,10 @@ var group_quotas_tmpl = '<div class="panel">\
</div>\
</div>\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="inline right" >'+tr("Max Memory (MB)")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="MEMORY"></input>\
</div>\
<div class="one columns">\
@ -155,16 +155,27 @@ var group_quotas_tmpl = '<div class="panel">\
</div>\
</div>\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="inline right" >'+tr("Max CPU")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="CPU"></input>\
</div>\
<div class="one columns">\
<div class=""></div>\
</div>\
</div>\
<div class="row">\
<div class="six columns">\
<label class="inline right" >'+tr("Max Volatile Storage (MB)")+':</label>\
</div>\
<div class="five columns">\
<input type="text" name="VOLATILE_SIZE"></input>\
</div>\
<div class="one columns">\
<div class=""></div>\
</div>\
</div>\
</div>\
<div id="datastore_quota">\
<div class="row">\
@ -528,9 +539,10 @@ function updateGroupInfo(request,group){
var info = group.GROUP;
var default_group_quotas = Quotas.default_quotas(info.DEFAULT_GROUP_QUOTAS);
var quotas_tab_html = '<div class="four columns">' + Quotas.vms(info, default_group_quotas) + '</div>';
quotas_tab_html += '<div class="four columns">' + Quotas.cpu(info, default_group_quotas) + '</div>';
quotas_tab_html += '<div class="four columns">' + Quotas.memory(info, default_group_quotas) + '</div>';
var quotas_tab_html = '<div class="three columns">' + Quotas.vms(info, default_group_quotas) + '</div>';
quotas_tab_html += '<div class="three columns">' + Quotas.cpu(info, default_group_quotas) + '</div>';
quotas_tab_html += '<div class="three columns">' + Quotas.memory(info, default_group_quotas) + '</div>';
quotas_tab_html += '<div class="three columns">' + Quotas.volatile_size(info, default_group_quotas) + '</div>';
quotas_tab_html += '<br><br>';
quotas_tab_html += '<div class="six columns">' + Quotas.image(info, default_group_quotas) + '</div>';
quotas_tab_html += '<div class="six columns">' + Quotas.network(info, default_group_quotas) + '</div>';

30
src/sunstone/public/js/plugins/users-tab.js
View File

@ -219,10 +219,10 @@ var user_quotas_tmpl = '<div class="panel">\
<hr>\
<div id="vm_quota">\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="inline right" >'+tr("Max VMs")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="VMS"></input>\
</div>\
<div class="one columns">\
@ -230,10 +230,10 @@ var user_quotas_tmpl = '<div class="panel">\
</div>\
</div>\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="inline right" >'+tr("Max Memory (MB)")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="MEMORY"></input>\
</div>\
<div class="one columns">\
@ -241,16 +241,27 @@ var user_quotas_tmpl = '<div class="panel">\
</div>\
</div>\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="inline right" >'+tr("Max CPU")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="CPU"></input>\
</div>\
<div class="one columns">\
<div class=""></div>\
</div>\
</div>\
<div class="row">\
<div class="six columns">\
<label class="inline right" >'+tr("Max Volatile Storage (MB)")+':</label>\
</div>\
<div class="five columns">\
<input type="text" name="VOLATILE_SIZE"></input>\
</div>\
<div class="one columns">\
<div class=""></div>\
</div>\
</div>\
</div>\
<div id="datastore_quota">\
<div class="row">\
@ -780,9 +791,10 @@ function updateUserInfo(request,user){
};
var default_user_quotas = Quotas.default_quotas(info.DEFAULT_USER_QUOTAS)
var quotas_tab_html = '<div class="four columns">' + Quotas.vms(info, default_user_quotas) + '</div>';
quotas_tab_html += '<div class="four columns">' + Quotas.cpu(info, default_user_quotas) + '</div>';
quotas_tab_html += '<div class="four columns">' + Quotas.memory(info, default_user_quotas) + '</div>';
var quotas_tab_html = '<div class="three columns">' + Quotas.vms(info, default_user_quotas) + '</div>';
quotas_tab_html += '<div class="three columns">' + Quotas.cpu(info, default_user_quotas) + '</div>';
quotas_tab_html += '<div class="three columns">' + Quotas.memory(info, default_user_quotas) + '</div>';
quotas_tab_html += '<div class="three columns">' + Quotas.volatile_size(info, default_user_quotas) + '</div>';
quotas_tab_html += '<br><br>';
quotas_tab_html += '<div class="six columns">' + Quotas.image(info, default_user_quotas) + '</div>';
quotas_tab_html += '<div class="six columns">' + Quotas.network(info, default_user_quotas) + '</div>';

26
src/sunstone/public/js/sunstone-util.js
View File

@ -1238,6 +1238,21 @@ var Quotas = {
return '';
}
},
"volatile_size" : function(info, default_quotas){
if (!$.isEmptyObject(info.VM_QUOTA)){
var volatile_bar = quotaBarMB(
info.VM_QUOTA.VM.VOLATILE_SIZE_USED,
info.VM_QUOTA.VM.VOLATILE_SIZE,
default_quotas.VM_QUOTA.VM.VOLATILE_SIZE);
var quotas_tab_html =
'<fieldset><legend>' + tr("Volatile disks") + '</legend><div>'+volatile_bar+'</div><br></fieldset>'
return quotas_tab_html;
} else {
return '';
}
},
"datastore" : function(info, default_quotas) {
if (!$.isEmptyObject(info.DATASTORE_QUOTA)){
var quotas_tab_html =
@ -1410,9 +1425,10 @@ var Quotas = {
if ($.isEmptyObject(default_quotas.VM_QUOTA)){
default_quotas.VM_QUOTA = {
"VM" : {
"VMS" : "0",
"MEMORY" : "0",
"CPU" : "0"
"VMS" : "0",
"MEMORY" : "0",
"CPU" : "0",
"VOLATILE_SIZE" : "0"
}
}
}
@ -1581,6 +1597,7 @@ function setupQuotaIcons(){
$('div#vm_quota input[name="VMS"]',dialog).val(quota.VMS);
$('div#vm_quota input[name="MEMORY"]',dialog).val(quota.MEMORY);
$('div#vm_quota input[name="CPU"]',dialog).val(quota.CPU);
$('div#vm_quota input[name="VOLATILE_SIZE"]',dialog).val(quota.VOLATILE_SIZE);
break;
case "DATASTORE":
$('div#datastore_quota select[name="ID"]',dialog).val(quota.ID);
@ -1675,7 +1692,8 @@ function quotaListItem(quota_json){
case "VM":
str += 'VMs: ' + quota_json.VMS + (quota_json.VMS_USED ? ' (' + quota_json.VMS_USED + '). ' : ". ") + '<br>' +
'Memory: ' + quota_json.MEMORY + (quota_json.MEMORY_USED ? ' MB (' + quota_json.MEMORY_USED + ' MB). ' : " MB. ") + '<br>' +
'CPU: ' + quota_json.CPU + (quota_json.CPU_USED ? ' (' + quota_json.CPU_USED + '). ' : ". ");
'CPU: ' + quota_json.CPU + (quota_json.CPU_USED ? ' (' + quota_json.CPU_USED + '). ' : ". ") + '<br>' +
'Volatile disks: ' + quota_json.VOLATILE_SIZE + (quota_json.VOLATILE_SIZE_USED ? ' MB (' + quota_json.VOLATILE_SIZE_USED + ' MB). ' : " MB. ");
break;
case "DATASTORE":
str += 'ID/Name: ' + getDatastoreName(quota_json.ID) + '. ' + '<br>' +