diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index f8e90aa2e1..2d53158ab7 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -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": diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index 16800093b6..2f7587f2f5 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -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"): diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 2cfb7362d2..c3f6d51224 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -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