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

Merge remote-tracking branch 'origin/bug-3639'

Browse Source
This commit is contained in:
Carlos Martín 2015-03-02 11:56:22 +01:00
commit ce2a62857a
3 changed files with 64 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -887,6 +887,55 @@ var OpenNebula = {
"VM": {
"resource": "VM",
"state": {
"INIT" : 0,
"PENDING" : 1,
"HOLD" : 2,
"ACTIVE" : 3,
"STOPPED" : 4,
"SUSPENDED" : 5,
"DONE" : 6,
"FAILED" : 7,
"POWEROFF" : 8,
"UNDEPLOYED": 9
},
"lcm_state": {
"LCM_INIT" : 0,
"PROLOG" : 1,
"BOOT" : 2,
"RUNNING" : 3,
"MIGRATE" : 4,
"SAVE_STOP" : 5,
"SAVE_SUSPEND" : 6,
"SAVE_MIGRATE" : 7,
"PROLOG_MIGRATE" : 8,
"PROLOG_RESUME" : 9,
"EPILOG_STOP" : 10,
"EPILOG" : 11,
"SHUTDOWN" : 12,
"CANCEL" : 13,
"FAILURE" : 14,
"CLEANUP_RESUBMIT" : 15,
"UNKNOWN" : 16,
"HOTPLUG" : 17,
"SHUTDOWN_POWEROFF" : 18,
"BOOT_UNKNOWN" : 19,
"BOOT_POWEROFF" : 20,
"BOOT_SUSPENDED" : 21,
"BOOT_STOPPED" : 22,
"CLEANUP_DELETE" : 23,
"HOTPLUG_SNAPSHOT" : 24,
"HOTPLUG_NIC" : 25,
"HOTPLUG_SAVEAS" : 26,
"HOTPLUG_SAVEAS_POWEROFF" : 27,
"HOTPLUG_SAVEAS_SUSPENDED" : 28,
"SHUTDOWN_UNDEPLOY" : 29,
"EPILOG_UNDEPLOY" : 30,
"PROLOG_UNDEPLOY" : 31,
"BOOT_UNDEPLOY" : 32
},
"create": function(params){
OpenNebula.Action.create(params,OpenNebula.VM.resource);
},

26
src/sunstone/public/js/plugins/vms-tab.js
View File

@ -32,19 +32,19 @@ function loadVNC(){
loadVNC();
var VNCstates=[
tr("RUNNING"),
tr("SHUTDOWN"),
tr("SHUTDOWN_POWEROFF"),
tr("UNKNOWN"),
tr("HOTPLUG"),
tr("CANCEL"),
tr("MIGRATE"),
tr("HOTPLUG_SNAPSHOT"),
tr("HOTPLUG_NIC"),
tr("HOTPLUG_SAVEAS"),
tr("HOTPLUG_SAVEAS_POWEROFF"),
tr("HOTPLUG_SAVEAS_SUSPENDED"),
tr("SHUTDOWN_UNDEPLOY")];
OpenNebula.VM.lcm_state.RUNNING,
OpenNebula.VM.lcm_state.SHUTDOWN,
OpenNebula.VM.lcm_state.SHUTDOWN_POWEROFF,
OpenNebula.VM.lcm_state.UNKNOWN,
OpenNebula.VM.lcm_state.HOTPLUG,
OpenNebula.VM.lcm_state.CANCEL,
OpenNebula.VM.lcm_state.MIGRATE,
OpenNebula.VM.lcm_state.HOTPLUG_SNAPSHOT,
OpenNebula.VM.lcm_state.HOTPLUG_NIC,
OpenNebula.VM.lcm_state.HOTPLUG_SAVEAS,
OpenNebula.VM.lcm_state.HOTPLUG_SAVEAS_POWEROFF,
OpenNebula.VM.lcm_state.HOTPLUG_SAVEAS_SUSPENDED,
OpenNebula.VM.lcm_state.SHUTDOWN_UNDEPLOY];
//Permanent storage for last value of aggregated network usage
//Used to calculate bandwidth

4
src/sunstone/public/js/sunstone.js
View File

@ -8379,7 +8379,7 @@ function ip_str(vm, divider){
// returns true if the vnc button should be enabled
function enableVnc(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
var state = parseInt(vm.LCM_STATE);
return (graphics &&
graphics.TYPE &&
@ -8389,7 +8389,7 @@ function enableVnc(vm){
function enableSPICE(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
var state = parseInt(vm.LCM_STATE);
return (graphics &&
graphics.TYPE &&