\
@@ -815,7 +829,7 @@ function setupImageAttributesDialogs(){
autoOpen:false,
width:400,
modal:true,
- height:270,
+ height:200,
resizable:false,
});
@@ -1034,7 +1048,7 @@ function createClusterDialog(){
//If it's successfull we refresh the list.
OpenNebula.Cluster.create({ data:cluster_json,
success: function(){
- OpenNebula.Cluster.list(updateClustersView,onError)},
+ OpenNebula.Cluster.list({success:updateClustersView,error:onError})},
error: onError});
$create_cluster_dialog.dialog('close');
return false;
@@ -1887,10 +1901,10 @@ function createVMachineDialog(){
});
$('button#create_vm_form_manual').click(function(){
- template = $('#vm_template').val();
+ template = $('#textarea_vm_template').val();
//wrap it in the "vm" object
- template = {vm: {vm_raw: template}};
+ template = {"vm": {"vm_raw": template}};
OpenNebula.VM.create({data: template,
success: addVMachineElement,
@@ -2078,7 +2092,7 @@ function createImageDialog(){
break;
}
obj = { "image" : img_json };
- OpenNebula.Image.create({data: obj,success: addImageElement,error: onError});
+ OpenNebula.Image.register({data: obj,success: addImageElement,error: onError});
$create_image_dialog.dialog('close');
return false;
@@ -2205,9 +2219,12 @@ function updateSingleElement(element,data_table,tag){
tr = $(tag).parents('tr')[0];
position = data_table.fnGetPosition(tr);
data_table.fnUpdate(element,position,0);
+ $('input',data_table).trigger("change");
+
}
function tableCheckboxesListener(dataTable){
+
context = dataTable.parents('form');
last_action_b = $('.last_action_button',context);
$('.top_button, .list_button',context).button("disable");
@@ -2217,13 +2234,21 @@ function tableCheckboxesListener(dataTable){
$('.new_button',context).button("enable");
//listen to changes
- $('input',dataTable).click(function(){
+ $('input',dataTable).live("change",function(){
dataTable = $(this).parents('table').dataTable();
context = dataTable.parents('form');
last_action_b = $('.last_action_button',context);
- nodes_length = $('input:checked',dataTable.fnGetNodes()).length;
+ nodes = dataTable.fnGetNodes();
+ total_length = nodes.length;
+ checked_length = $('input:checked',nodes).length;
- if (nodes_length){
+ if (total_length == checked_length){
+ $('.check_all',dataTable).attr("checked","checked");
+ } else {
+ $('.check_all',dataTable).removeAttr("checked");
+ }
+
+ if (checked_length){
$('.top_button, .list_button',context).button("enable");
if (last_action_b.length && last_action_b.val().length){
last_action_b.button("enable");
@@ -2241,6 +2266,7 @@ function tableCheckboxesListener(dataTable){
function deleteElement(data_table,tag){
tr = $(tag).parents('tr')[0];
data_table.fnDeleteRow(tr);
+ $('input',data_table).trigger("change");
}
function addElement(element,data_table){
@@ -2253,18 +2279,24 @@ function hostElementArray(host_json){
if (!acpu) {acpu=100};
acpu = acpu - parseInt(host.HOST_SHARE.CPU_USAGE);
-
total_mem = parseInt(host.HOST_SHARE.MAX_MEM);
free_mem = parseInt(host.HOST_SHARE.FREE_MEM);
- ratio_mem = Math.round(((total_mem - free_mem) / total_mem) * 100);
+
+ if (total_mem == 0) {
+ ratio_mem = 0;
+ } else {
+ ratio_mem = Math.round(((total_mem - free_mem) / total_mem) * 100);
+ }
total_cpu = parseInt(host.HOST_SHARE.MAX_CPU);
used_cpu = Math.max(total_cpu - parseInt(host.HOST_SHARE.USED_CPU),acpu);
- ratio_cpu = Math.round(((total_cpu - used_cpu) / total_cpu) * 100);
-
-
+ if (total_cpu == 0) {
+ ratio_cpu = 0;
+ } else {
+ ratio_cpu = Math.round(((total_cpu - used_cpu) / total_cpu) * 100);
+ }
pb_mem =
'
\
@@ -2306,7 +2338,8 @@ function hostElementArray(host_json){
//Adds a listener to show the extended info when clicking on a row
function hostInfoListener(){
- $('#tbodyhosts tr').click(function(e){
+ $('#tbodyhosts tr').live("click",function(e){
+
//do nothing if we are clicking a checkbox!
if ($(e.target).is('input')) {return true;}
@@ -2327,13 +2360,17 @@ function hostInfoListener(){
//~ }
function vMachineElementArray(vm_json){
- vm = vm_json.VM;
+ var vm = vm_json.VM;
+ var state = OpenNebula.Helper.resource_state("vm",vm.STATE);
+ if (state == "ACTIVE") {
+ state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
+ }
return [
'
',
vm.ID,
vm.USERNAME ? vm.USERNAME : getUserName(vm.UID),
vm.NAME,
- OpenNebula.Helper.resource_state("vm",vm.STATE),
+ state,
vm.CPU,
humanize_size(vm.MEMORY),
vm.HISTORY ? vm.HISTORY.HOSTNAME : "--",
@@ -2343,7 +2380,8 @@ function vMachineElementArray(vm_json){
//Adds a listener to show the extended info when clicking on a row
function vMachineInfoListener(){
- $('#tbodyvmachines tr').click(function(e){
+
+ $('#tbodyvmachines tr').live("click", function(e){
if ($(e.target).is('input')) {return true;}
aData = dataTable_vMachines.fnGetData(this);
id = $(aData[0]).val();
@@ -2354,9 +2392,9 @@ function vMachineInfoListener(){
function vNetworkElementArray(vn_json){
network = vn_json.VNET;
- if (network.TOTAL_LEASES != undefined){
+ if (network.TOTAL_LEASES){
total_leases = network.TOTAL_LEASES;
- }else if (network.LEASES.LEASE != undefined){
+ }else if (network.LEASES && network.LEASES.LEASE){
total_leases = network.LEASES.LEASE.length ? network.LEASES.LEASE.length : "1";
} else{
total_leases = "0";
@@ -2373,7 +2411,8 @@ function vNetworkElementArray(vn_json){
}
//Adds a listener to show the extended info when clicking on a row
function vNetworkInfoListener(){
- $('#tbodyvnetworks tr').click(function(e){
+
+ $('#tbodyvnetworks tr').live("click", function(e){
if ($(e.target).is('input')) {return true;}
aData = dataTable_vNetworks.fnGetData(this);
id = $(aData[0]).val();
@@ -2384,10 +2423,16 @@ function vNetworkInfoListener(){
function userElementArray(user_json){
user = user_json.USER;
+ if (!user.NAME || user.NAME == {}){
+ name = "";
+ } else {
+ name = user.NAME;
+ }
+
return [
'
',
user.ID,
- user.NAME
+ name
]
}
@@ -2407,8 +2452,9 @@ function imageElementArray(image_json){
];
}
-function imageInfoListener(){
- $('#tbodyimages tr').click(function(e){
+function imageInfoListener(target){
+
+ $('#tbodyimages tr').live("click",function(e){
if ($(e.target).is('input')) {return true;}
aData = dataTable_images.fnGetData(this);
id = $(aData[0]).val();
@@ -2461,7 +2507,9 @@ function updateImageSelect(image_list){
images_select="";
images_select += "
";
$.each(image_list, function(){
- images_select += "
";
+ if ((this.IMAGE.STATE < 3) && (this.IMAGE.STATE > 0)){
+ images_select += '
';
+ }
});
//update static selectors
@@ -2582,8 +2630,9 @@ function onError(request,error_json) {
};
//Parse known errors:
- var action_error = new RegExp("^\\[(\\w+)\\] Error trying to (\\w+) (\\w+) \\[(\\w+)\\].*Reason: (.*)\.$");
- var get_error = new RegExp("^\\[(\\w+)\\] Error getting (\\w+) \\[(\\w+)\\]\.$");
+ var action_error = /^\[(\w+)\] Error trying to (\w+) (\w+) \[(\w+)\].*Reason: (.*)\.$/;
+ var action_error_noid = /^\[(\w+)\] Error trying to (\w+) (\w+) (.*)\.$/;
+ var get_error = /^\[(\w+)\] Error getting (\w+) \[(\w+)\]\.$/;
var auth_error = /^\[(\w+)\] User \[.\] not authorized to perform (\w+) on (\w+) \[?(\w+)\]?\.?$/;
if (m = message.match(action_error)) {
@@ -2592,6 +2641,11 @@ function onError(request,error_json) {
object = m[3];
id = m[4];
reason = m[5];
+ } else if (m = message.match(action_error_noid)) {
+ method = m[1];
+ action = m[2];
+ object = m[3];
+ reason = m[4];
} else if (m = message.match(get_error)) {
method = m[1];
action = "SHOW";
@@ -2634,7 +2688,7 @@ function onError(request,error_json) {
function updateHostElement(request, host_json){
id = host_json.HOST.ID;
element = hostElementArray(host_json);
- updateSingleElement(element,dataTable_hosts,'#host_'+id)
+ updateSingleElement(element,dataTable_hosts,'#host_'+id);
}
function deleteHostElement(req){
@@ -2642,10 +2696,9 @@ function deleteHostElement(req){
}
function addHostElement(request,host_json){
+ id = host_json.HOST.ID;
element = hostElementArray(host_json);
addElement(element,dataTable_hosts);
- hostInfoListener();
- tableCheckboxesListener(dataTable_hosts);
}
function updateHostsView (request,host_list){
@@ -2660,10 +2713,6 @@ function updateHostsView (request,host_list){
updateView(host_list_array,dataTable_hosts);
updateHostSelect(host_list);
updateDashboard("hosts");
-
- //We need to re-add this listener as list has been refreshed
- hostInfoListener();
- tableCheckboxesListener(dataTable_hosts);
}
@@ -2706,12 +2755,11 @@ function deleteVMachineElement(req){
}
function addVMachineElement(request,vm_json){
- notifySubmit('OpenNebula.VM.create',vm_json.VM.ID);
+ id = vm_json.VM.ID;
+ notifySubmit('OpenNebula.VM.create',id);
element = vMachineElementArray(vm_json);
addElement(element,dataTable_vMachines);
- vMachineInfoListener();
updateVMInfo(null,vm_json);
- tableCheckboxesListener(dataTable_vMachines);
}
function updateVMachinesView(request, vmachine_list){
@@ -2723,8 +2771,6 @@ function updateVMachinesView(request, vmachine_list){
});
updateView(vmachine_list_array,dataTable_vMachines);
- vMachineInfoListener();
- tableCheckboxesListener(dataTable_vMachines);
updateDashboard("vms");
}
@@ -2733,17 +2779,18 @@ function updateVNetworkElement(request, vn_json){
id = vn_json.VNET.ID;
element = vNetworkElementArray(vn_json);
updateSingleElement(element,dataTable_vNetworks,'#vnetwork_'+id);
- tableCheckboxesListener(dataTable_vNetworks);
}
function deleteVNetworkElement(req){
deleteElement(dataTable_vNetworks,'#vnetwork_'+req.request.data);
+ //How to delete vNetwork select option here?
}
function addVNetworkElement(request,vn_json){
element = vNetworkElementArray(vn_json);
addElement(element,dataTable_vNetworks);
- vNetworkInfoListener();
+ vnetworks_select += "
";
+ $('div.vm_section#networks select#NETWORK').html(vnetworks_select);
}
function updateVNetworksView(request, network_list){
@@ -2756,9 +2803,7 @@ function updateVNetworksView(request, network_list){
updateView(network_list_array,dataTable_vNetworks);
updateNetworkSelect(network_list);
- vNetworkInfoListener();
updateDashboard("vnets");
- tableCheckboxesListener(dataTable_vNetworks);
}
@@ -2766,7 +2811,6 @@ function updateUserElement(request, user_json){
id = user_json.USER.ID;
element = userElementArray(user_json);
updateSingleElement(element,dataTable_users,'#user_'+id);
- tableCheckboxesListener(dataTable_users);
}
function deleteUserElement(req){
@@ -2787,7 +2831,6 @@ function updateUsersView(request,users_list){
});
updateView(user_list_array,dataTable_users);
updateDashboard("users");
- tableCheckboxesListener(dataTable_users);
}
@@ -2795,12 +2838,27 @@ function updateImageElement(request, image_json){
id = image_json.IMAGE.ID;
element = imageElementArray(image_json);
updateSingleElement(element,dataTable_images,'#image_'+id);
- tableCheckboxesListener(dataTable_images);
- imageInfoListener();
+ if ((image_json.IMAGE.STATE < 3) &&
+ (image_json.IMAGE.STATE > 0) &&
+ ($('#img_sel_'+id,images_select).length == 0)){
+ images_select += '
';
+ }
+ else {
+ tag = 'option#img_sel_'+id;
+ select = $('
');
+ $(tag,select).remove();
+ images_select = $(select).html();
+ }
+ $('div.vm_section#disks select#IMAGE').html(images_select);
}
function deleteImageElement(req){
deleteElement(dataTable_images,'#image_'+req.request.data);
+ tag = 'option#img_sel_'+req.request.data;
+ select = $('
');
+ $(tag,select).remove();
+ images_select = $(select).html();
+ $('div.vm_section#disks select#IMAGE').html(images_select);
}
function addImageElement(request, image_json){
@@ -2817,8 +2875,6 @@ function updateImagesView(request, images_list){
updateView(image_list_array,dataTable_images);
updateImageSelect(images_list);
- imageInfoListener();
- tableCheckboxesListener(dataTable_images);
updateDashboard("images");
@@ -2998,7 +3054,7 @@ function updateVMInfo(request,vm){
\
\
| LCM State | \
- '+OpenNebula.Helper.resource_state("vm",vm_info.LCMSTATE)+' | \
+ '+OpenNebula.Helper.resource_state("vm_lcm",vm_info.LCM_STATE)+' | \
\
\
| Start time | \
@@ -3006,7 +3062,7 @@ function updateVMInfo(request,vm){
\
\
| Deploy ID | \
- '+(vm_info.DEPLOY_ID ? vm_info.DEPLOY_ID : "-")+' | \
+ '+(typeof(vm_info.DEPLOY_ID) == "object" ? "-" : vm_info.DEPLOY_ID)+' | \
\
\
\
@@ -3093,14 +3149,16 @@ function updateVNetworkInfo(request,vn){
| Public | \
'+(parseInt(vn_info.PUBLIC) ? "yes" : "no" )+' | \
\
-
\
-
';
+ if (vn_info.TEMPLATE.TYPE == "FIXED"){
+ rendered_info += '
\
\
| Leases information |
|---|
\
'+
prettyPrintJSON(vn_info.LEASES)+
- '
\
-