diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js index 88080cfd08..aa0a71979a 100644 --- a/src/sunstone/public/app/opennebula/vm.js +++ b/src/sunstone/public/app/opennebula/vm.js @@ -33,21 +33,23 @@ define(function(require) { "FAILED", "POWEROFF", "UNDEPLOYED", - "CLONING" + "CLONING", + "CLONING_FAILURE" ]; var STATES = { - INIT : 0, - PENDING : 1, - HOLD : 2, - ACTIVE : 3, - STOPPED : 4, - SUSPENDED : 5, - DONE : 6, - //FAILED : 7, - POWEROFF : 8, - UNDEPLOYED : 9, - CLONING : 10 + INIT : 0, + PENDING : 1, + HOLD : 2, + ACTIVE : 3, + STOPPED : 4, + SUSPENDED : 5, + DONE : 6, + //FAILED : 7, + POWEROFF : 8, + UNDEPLOYED : 9, + CLONING : 10, + CLONING_FAILURE : 11 }; var LCM_STATES_STR = [ diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js index 6e3658ea31..1dc08b496e 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js +++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js @@ -988,10 +988,6 @@ define(function(require) { var state_str; switch (state) { - case OpenNebulaVM.STATES.CLONING: - state_color = 'deploying'; - state_str = Locale.tr("DEPLOYING") + " (1/4)"; - break; case OpenNebulaVM.STATES.INIT: case OpenNebulaVM.STATES.PENDING: case OpenNebulaVM.STATES.HOLD: @@ -1107,6 +1103,17 @@ define(function(require) { state_str = Locale.tr("UNDEPLOYED"); break; + + case OpenNebulaVM.STATES.CLONING: + state_color = 'deploying'; + state_str = Locale.tr("DEPLOYING") + " (1/4)"; + break; + + case OpenNebulaVM.STATES.CLONING_FAILURE: + state_color = 'error'; + state_str = Locale.tr("ERROR"); + break; + default: state_color = 'powering_off'; state_str = Locale.tr("UNKNOWN"); diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js b/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js index a4c295c16c..a5feaea69b 100644 --- a/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js +++ b/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js @@ -49,6 +49,11 @@ define(function(require) { STATE_ACTIONS[OpenNebulaVM.STATES.UNDEPLOYED] = ["VM.delete", "VM.delete_recreate", "VM.resume", "VM.resize", "VM.deploy"]; + STATE_ACTIONS[OpenNebulaVM.STATES.CLONING] = + ["VM.delete", "VM.delete_recreate"]; + + STATE_ACTIONS[OpenNebulaVM.STATES.CLONING_FAILURE] = + ["VM.delete", "VM.delete_recreate", "VM.recover"]; var LCM_STATE_ACTIONS = {}; LCM_STATE_ACTIONS[ OpenNebulaVM.LCM_STATES.LCM_INIT ] = [];