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

Feature #3654: Show the complete lcm state name in sunstone

Browse Source
This commit is contained in:
Carlos Martín 2015-04-23 17:06:41 +02:00
parent 753f640166
commit c5ab2dca49
3 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,8 +116,8 @@ var OpenNebula = {
"POWEROFF",
"UNDEPLOYED"][value]);
break;
case "VM_LCM":
case "vm_lcm":
case "SHORT_VM_LCM":
case "short_vm_lcm":
state = tr(["LCM_INIT", // LCM_INIT
"PROLOG", // PROLOG
"BOOT", // BOOT
@ -165,7 +165,58 @@ var OpenNebula = {
"FAILURE", // PROLOG_MIGRATE_POWEROFF_FAILURE
"MIGRATE", // PROLOG_MIGRATE_SUSPEND
"FAILURE" // PROLOG_MIGRATE_SUSPEND_FAILURE
][value]);
][value]);
break;
case "VM_LCM":
case "vm_lcm":
state = tr(["LCM_INIT",
"PROLOG",
"BOOT",
"RUNNING",
"MIGRATE",
"SAVE_STOP",
"SAVE_SUSPEND",
"SAVE_MIGRATE",
"PROLOG_MIGRATE",
"PROLOG_RESUME",
"EPILOG_STOP",
"EPILOG",
"SHUTDOWN",
"CANCEL",
"FAILURE",
"CLEANUP_RESUBMIT",
"UNKNOWN",
"HOTPLUG",
"SHUTDOWN_POWEROFF",
"BOOT_UNKNOWN",
"BOOT_POWEROFF",
"BOOT_SUSPENDED",
"BOOT_STOPPED",
"CLEANUP_DELETE",
"HOTPLUG_SNAPSHOT",
"HOTPLUG_NIC",
"HOTPLUG_SAVEAS",
"HOTPLUG_SAVEAS_POWEROFF",
"HOTPLUG_SAVEAS_SUSPENDED",
"SHUTDOWN_UNDEPLOY",
"EPILOG_UNDEPLOY",
"PROLOG_UNDEPLOY",
"BOOT_UNDEPLOY",
"HOTPLUG_PROLOG_POWEROFF",
"HOTPLUG_EPILOG_POWEROFF",
"BOOT_MIGRATE",
"BOOT_FAILURE",
"BOOT_MIGRATE_FAILURE",
"PROLOG_MIGRATE_FAILURE",
"PROLOG_FAILURE",
"EPILOG_FAILURE",
"EPILOG_STOP_FAILURE",
"EPILOG_UNDEPLOY_FAILURE",
"PROLOG_MIGRATE_POWEROFF",
"PROLOG_MIGRATE_POWEROFF_FAILURE",
"PROLOG_MIGRATE_SUSPEND",
"PROLOG_MIGRATE_SUSPEND_FAILURE"
][value]);
break;
case "IMAGE":
case "image":

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

@ -3498,7 +3498,7 @@ function get_provision_vm_state(data) {
state_str = tr("ERROR");
break;
case tr("ACTIVE"):
var lcm_state = OpenNebula.Helper.resource_state("vm_lcm",data.LCM_STATE);
var lcm_state = OpenNebula.Helper.resource_state("short_vm_lcm",data.LCM_STATE);
switch (lcm_state) {
case tr("LCM_INIT"):

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

@ -1189,7 +1189,7 @@ function vMachineElementArray(vm_json){
}
if (state == tr("ACTIVE")) {
state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
state = OpenNebula.Helper.resource_state("short_vm_lcm",vm.LCM_STATE);
};
// Build hidden user template