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

Bug #785: Fix leases prints for VNETs

Browse Source
This commit is contained in:
Hector Sanjuan 2011-08-30 19:11:47 +02:00 committed by Ruben S. Montero
parent 9154a08d83
commit 7512bf4f38
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/sunstone/public/js/plugins/vnets-tab.js
View File

@ -302,13 +302,6 @@ function vnShow(req){
//returns an array with the VNET information fetched from the JSON object
function vNetworkElementArray(vn_json){
var network = vn_json.VNET;
var total_leases = "0";
if (network.TOTAL_LEASES){
total_leases = network.TOTAL_LEASES;
} else if (network.LEASES && network.LEASES.LEASE){
total_leases = network.LEASES.LEASE.length ? network.LEASES.LEASE.length : "1";
}
return [
'<input type="checkbox" id="vnetwork_'+network.ID+'" name="selected_items" value="'+network.ID+'"/>',
@ -319,7 +312,7 @@ function vNetworkElementArray(vn_json){
parseInt(network.TYPE) ? "FIXED" : "RANGED",
network.BRIDGE,
parseInt(network.PUBLIC) ? "yes" : "no",
total_leases ];
network.TOTAL_LEASES ];
}
@ -411,18 +404,14 @@ function updateVNetworkInfo(request,vn){
<td class="key_td">Public</td>\
<td class="value_td">'+(parseInt(vn_info.PUBLIC) ? "yes" : "no" )+'</td>\
</tr>\
</table>';
//if it is a fixed VNET we can add leases information
if (vn_info.TEMPLATE.TYPE == "FIXED"){
info_tab_content +=
'<table id="vn_leases_info_table" class="info_table">\
</table>\
<table id="vn_leases_info_table" class="info_table">\
<thead>\
<tr><th colspan="2">Leases information</th></tr>\
</thead>'+
prettyPrintJSON(vn_info.TEMPLATE.LEASES)+
'</table>';
}
printLeases(vn_info.LEASES)+
'</table>';;
var info_tab = {
@ -446,6 +435,21 @@ function updateVNetworkInfo(request,vn){
}
function printLeases(leases){
if (!leases.LEASE) //empty
{
return "";
};
if (leases.LEASE.constructor == Array) //>1 lease
{
return prettyPrintJSON(leases.LEASE);
}
else {//1 lease
return prettyPrintJSON([leases.LEASE]);
};
}
//Prepares the vnet creation dialog
function setupCreateVNetDialog() {
dialogs_context.append('<div title="Create Virtual Network" id="create_vn_dialog"></div>');