diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index 153c008778..0a51e86d05 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -96,7 +96,7 @@ public: HOTPLUG_SAVEAS = 26, HOTPLUG_SAVEAS_POWEROFF = 27, HOTPLUG_SAVEAS_SUSPENDED = 28, - UNDEPLOYING = 29, + SHUTDOWN_UNDEPLOY = 29, EPILOG_UNDEPLOY = 30, PROLOG_UNDEPLOY = 31 }; diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 47eeba6267..f31647af0e 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -360,16 +360,16 @@ void LifeCycleManager::undeploy_action(int vid, bool hard) VirtualMachineManager * vmm = nd.get_vmm(); //---------------------------------------------------- - // UNDEPLOYING STATE + // SHUTDOWN_UNDEPLOY STATE //---------------------------------------------------- - vm->set_state(VirtualMachine::UNDEPLOYING); + vm->set_state(VirtualMachine::SHUTDOWN_UNDEPLOY); vm->set_resched(false); vmpool->update(vm); - vm->log("LCM",Log::INFO,"New VM state is UNDEPLOYING"); + vm->log("LCM",Log::INFO,"New VM state is SHUTDOWN_UNDEPLOY"); //---------------------------------------------------- diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index 45fd36d543..3c96f3b50d 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -514,7 +514,7 @@ void LifeCycleManager::shutdown_success_action(int vid) dm->trigger(DispatchManager::POWEROFF_SUCCESS,vid); } - else if (vm->get_lcm_state() == VirtualMachine::UNDEPLOYING) + else if (vm->get_lcm_state() == VirtualMachine::SHUTDOWN_UNDEPLOY) { //---------------------------------------------------- // EPILOG_UNDEPLOY STATE @@ -567,7 +567,7 @@ void LifeCycleManager::shutdown_failure_action(int vid) if ( vm->get_lcm_state() == VirtualMachine::SHUTDOWN || vm->get_lcm_state() == VirtualMachine::SHUTDOWN_POWEROFF || - vm->get_lcm_state() == VirtualMachine::UNDEPLOYING ) + vm->get_lcm_state() == VirtualMachine::SHUTDOWN_UNDEPLOY ) { //---------------------------------------------------- // RUNNING STATE FROM SHUTDOWN @@ -959,7 +959,7 @@ void LifeCycleManager::cancel_success_action(int vid) tm->trigger(TransferManager::EPILOG,vid); } - else if (vm->get_lcm_state() == VirtualMachine::UNDEPLOYING) + else if (vm->get_lcm_state() == VirtualMachine::SHUTDOWN_UNDEPLOY) { //---------------------------------------------------- // EPILOG_UNDEPLOY STATE @@ -1011,7 +1011,7 @@ void LifeCycleManager::cancel_failure_action(int vid) } if ( vm->get_lcm_state() == VirtualMachine::CANCEL || - vm->get_lcm_state() == VirtualMachine::UNDEPLOYING ) + vm->get_lcm_state() == VirtualMachine::SHUTDOWN_UNDEPLOY ) { //---------------------------------------------------- // RUNNING STATE FROM CANCEL diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java index 6d6021ef58..dec5c96720 100644 --- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java +++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java @@ -58,7 +58,8 @@ public class VirtualMachine extends PoolElement{ "SUSPENDED", "DONE", "FAILED", - "POWEROFF" }; + "POWEROFF", + "UNDEPLOYED" }; private static final String[] SHORT_VM_STATES = { @@ -70,7 +71,8 @@ public class VirtualMachine extends PoolElement{ "susp", "done", "fail", - "poff" }; + "poff", + "unde" }; private static final String[] LCM_STATE = { @@ -102,7 +104,10 @@ public class VirtualMachine extends PoolElement{ "HOTPLUG_NIC", "HOTPLUG_SAVEAS", "HOTPLUG_SAVEAS_POWEROFF", - "HOTPLUG_SAVEAS_SUSPENDED" }; + "HOTPLUG_SAVEAS_SUSPENDED", + "SHUTDOWN_UNDEPLOY", + "EPILOG_UNDEPLOY", + "PROLOG_UNDEPLOY" }; private static final String[] SHORT_LCM_STATES = { @@ -501,12 +506,13 @@ public class VirtualMachine extends PoolElement{ *