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

Feature #495: Added LCM dictionary to OpenNebula.Helper.resource_state and fixed bug in VM template dialog regarding LCM_STATE

Browse Source
This commit is contained in:
Jaime Melis 2011-02-23 18:41:28 +01:00
parent b0cf374ca8
commit e5f3101820
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/sunstone/public/js/one-ui_views.js
View File

@ -59,14 +59,14 @@ $(document).ready(function() {
confirmButtonListener(); //listen to buttons that require confirmation
confirmWithSelectListener(); //listen to buttons requiring a selector
actionButtonListener(); //listens to all simple actions (not creates)
hostInfoListener();
vMachineInfoListener();
vNetworkInfoListener();
imageInfoListener();
setupImageAttributesDialogs(); //setups the add/update/remove attr dialogs
//Jquery-ui eye-candy
@ -75,7 +75,7 @@ $(document).ready(function() {
emptyDashboard();
preloadTables();
setupAutoRefresh();
tableCheckboxesListener(dataTable_hosts);
tableCheckboxesListener(dataTable_vMachines);
tableCheckboxesListener(dataTable_vNetworks);
@ -501,7 +501,7 @@ function confirmWithSelectListener(){
});
$('div#confirm_with_select_dialog button').button();
$( '.confirm_with_select_button').live("click",function(){
val=$(this).val();
tip="";
@ -2218,7 +2218,7 @@ function updateSingleElement(element,data_table,tag){
position = data_table.fnGetPosition(tr);
data_table.fnUpdate(element,position,0);
$('input',data_table).trigger("change");
}
function tableCheckboxesListener(dataTable){
@ -2329,7 +2329,7 @@ function hostElementArray(host_json){
//Adds a listener to show the extended info when clicking on a row
function hostInfoListener(){
$('#tbodyhosts tr').live("click",function(e){
//do nothing if we are clicking a checkbox!
if ($(e.target).is('input')) {return true;}
@ -2350,13 +2350,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 [
'<input type="checkbox" id="vm_'+vm.ID+'" name="selected_items" value="'+vm.ID+'"/>',
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 : "--",
@ -2397,7 +2401,7 @@ function vNetworkElementArray(vn_json){
}
//Adds a listener to show the extended info when clicking on a row
function vNetworkInfoListener(){
$('#tbodyvnetworks tr').live("click", function(e){
if ($(e.target).is('input')) {return true;}
aData = dataTable_vNetworks.fnGetData(this);
@ -2433,7 +2437,7 @@ function imageElementArray(image_json){
}
function imageInfoListener(target){
$('#tbodyimages tr').live("click",function(e){
if ($(e.target).is('input')) {return true;}
aData = dataTable_images.fnGetData(this);
@ -2766,7 +2770,7 @@ function deleteVNetworkElement(req){
function addVNetworkElement(request,vn_json){
element = vNetworkElementArray(vn_json);
addElement(element,dataTable_vNetworks);
}
function updateVNetworksView(request, network_list){
@ -3013,7 +3017,7 @@ function updateVMInfo(request,vm){
</tr>\
<tr>\
<td class="key_td">LCM State</td>\
<td class="value_td">'+OpenNebula.Helper.resource_state("vm",vm_info.LCMSTATE)+'</td>\
<td class="value_td">'+OpenNebula.Helper.resource_state("vm_lcm",vm_info.LCM_STATE)+'</td>\
</tr>\
<tr>\
<td class="key_td">Start time</td>\

19
src/sunstone/public/js/opennebula.js
View File

@ -65,6 +65,25 @@ var OpenNebula = {
"DONE",
"FAILED"][value];
break;
case "VM_LCM","vm_lcm":
return ["LCM_INIT",
"PROLOG",
"BOOT",
"RUNNING",
"MIGRATE",
"SAVE_STOP",
"SAVE_SUSPEND",
"SAVE_MIGRATE",
"PROLOG_MIGRATE",
"PROLOG_RESUME",
"EPILOG_STOP",
"EPILOG",
"SHUTDOWN",
"CANCEL",
"FAILURE",
"CLEANUP",
"UNKNOWN"][value];
break;
case "IMAGE","image":
return ["INIT",
"READY",