From 728d0435745c31cb6461ecd91efc7b623222f2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 2 Apr 2013 17:01:22 +0200 Subject: [PATCH] Feature #1839: Rename shutdown-save to undeploy --- include/DispatchManager.h | 6 ++-- include/LifeCycleManager.h | 6 ++-- include/VirtualMachine.h | 8 ++--- src/cli/onevm | 8 ++--- src/dm/DispatchManager.cc | 8 ++--- src/dm/DispatchManagerActions.cc | 12 ++++---- src/dm/DispatchManagerStates.cc | 12 ++++---- src/lcm/LifeCycleActions.cc | 14 ++++----- src/lcm/LifeCycleManager.cc | 16 +++++----- src/lcm/LifeCycleStates.cc | 34 ++++++++++----------- src/oca/ruby/opennebula/virtual_machine.rb | 20 ++++++------ src/rm/RequestManagerVirtualMachine.cc | 12 ++++---- src/scheduler/src/pool/VirtualMachineXML.cc | 4 +-- src/tm/TransferManagerDriver.cc | 8 ++--- src/vmm/VirtualMachineManager.cc | 2 +- 15 files changed, 84 insertions(+), 86 deletions(-) diff --git a/include/DispatchManager.h b/include/DispatchManager.h index 4932b58975..3acfd57f65 100644 --- a/include/DispatchManager.h +++ b/include/DispatchManager.h @@ -46,7 +46,7 @@ public: { SUSPEND_SUCCESS,/**< Send by LCM when a VM is suspended*/ STOP_SUCCESS, /**< Send by LCM when a VM is stopped*/ - SHUTDOWN_SAVE_SUCCESS, /**< Send by LCM when a VM is shut down and saved*/ + UNDEPLOY_SUCCESS, /**< Send by LCM when a VM is undeployed and saved*/ POWEROFF_SUCCESS, /**< Send by LCM when a VM is powered off */ DONE, /**< Send by LCM when a VM is shut down*/ FAILED, /**< Send by LCM when one of the execution steps fails*/ @@ -138,7 +138,7 @@ public: * @return 0 on success, -1 if the VM does not exits or -2 if the VM is * in a wrong a state */ - int shutdown_save( + int undeploy ( int vid, bool hard); @@ -408,7 +408,7 @@ private: void stop_success_action(int vid); - void shutdown_save_success_action(int vid); + void undeploy_success_action(int vid); void poweroff_success_action(int vid); diff --git a/include/LifeCycleManager.h b/include/LifeCycleManager.h index 967f9235be..0541da9349 100644 --- a/include/LifeCycleManager.h +++ b/include/LifeCycleManager.h @@ -84,8 +84,8 @@ public: MIGRATE, /**< Sent by the DM to migrate a VM to other host */ LIVE_MIGRATE, /**< Sent by the DM to live-migrate a VM */ SHUTDOWN, /**< Sent by the DM to shutdown a running VM */ - SHUTDOWN_SAVE, /**< Sent by the DM to shutdown a running VM */ - SHUTDOWN_SAVE_HARD, /**< Sent by the DM to shutdown a running VM */ + UNDEPLOY, /**< Sent by the DM to undeploy a running VM */ + UNDEPLOY_HARD, /**< Sent by the DM to force undeploy a running VM */ POWEROFF, /**< Sent by the DM to power off a running VM */ RESTART, /**< Sent by the DM to restart a deployed VM */ DELETE, /**< Sent by the DM to delete a VM */ @@ -249,7 +249,7 @@ private: void shutdown_action(int vid); - void shutdown_save_action(int vid, bool hard); + void undeploy_action(int vid, bool hard); void poweroff_action(int vid); diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index 96f1a7381d..153c008778 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -59,7 +59,7 @@ public: DONE = 6, FAILED = 7, POWEROFF = 8, - SHUTDOWN_SAVED = 9 + UNDEPLOYED = 9 }; /** @@ -96,9 +96,9 @@ public: HOTPLUG_SAVEAS = 26, HOTPLUG_SAVEAS_POWEROFF = 27, HOTPLUG_SAVEAS_SUSPENDED = 28, - SHUTDOWN_SAVE = 29, - EPILOG_SHUTDOWN_SAVE = 30, - PROLOG_SHUTDOWN_SAVE = 31 + UNDEPLOYING = 29, + EPILOG_UNDEPLOY = 30, + PROLOG_UNDEPLOY = 31 }; // ------------------------------------------------------------------------- diff --git a/src/cli/onevm b/src/cli/onevm index e4b79af43e..777e007bea 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -319,7 +319,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do end end - shutdown_save_desc = <<-EOT.unindent + undeploy_desc = <<-EOT.unindent Shuts down the given VM. The VM is saved in the system Datastore. With --hard it unplugs the VM. @@ -327,17 +327,17 @@ cmd=CommandParser::CmdParser.new(ARGV) do States: RUNNING EOT - command :"shutdown-save", shutdown_save_desc, [:range,:vmid_list], + command :undeploy, undeploy_desc, [:range,:vmid_list], :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do - command_name='shutdown-save' + command_name='undeploy' command_name<<'-hard' if options[:hard] if (!options[:schedule].nil?) helper.schedule_actions(args[0], options, command_name) else helper.perform_actions(args[0],options,"shutting down") do |vm| - vm.shutdown_save(options[:hard]==true) + vm.undeploy(options[:hard]==true) end end end diff --git a/src/dm/DispatchManager.cc b/src/dm/DispatchManager.cc index 03f632e45a..a428aeec99 100644 --- a/src/dm/DispatchManager.cc +++ b/src/dm/DispatchManager.cc @@ -77,8 +77,8 @@ void DispatchManager::trigger(Actions action, int _vid) aname = "STOP_SUCCESS"; break; - case SHUTDOWN_SAVE_SUCCESS: - aname = "SHUTDOWN_SAVE_SUCCESS"; + case UNDEPLOY_SUCCESS: + aname = "UNDEPLOY_SUCCESS"; break; case POWEROFF_SUCCESS: @@ -134,9 +134,9 @@ void DispatchManager::do_action(const string &action, void * arg) { stop_success_action(vid); } - else if (action == "SHUTDOWN_SAVE_SUCCESS") + else if (action == "UNDEPLOY_SUCCESS") { - shutdown_save_success_action(vid); + undeploy_success_action(vid); } else if (action == "POWEROFF_SUCCESS") { diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc index 549c9ad606..29e691a4b7 100644 --- a/src/dm/DispatchManagerActions.cc +++ b/src/dm/DispatchManagerActions.cc @@ -209,7 +209,7 @@ error: /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -int DispatchManager::shutdown_save( +int DispatchManager::undeploy( int vid, bool hard) { @@ -234,11 +234,11 @@ int DispatchManager::shutdown_save( if (hard) { - lcm->trigger(LifeCycleManager::SHUTDOWN_SAVE_HARD,vid); + lcm->trigger(LifeCycleManager::UNDEPLOY_HARD,vid); } else { - lcm->trigger(LifeCycleManager::SHUTDOWN_SAVE,vid); + lcm->trigger(LifeCycleManager::UNDEPLOY,vid); } } else @@ -551,7 +551,7 @@ int DispatchManager::resume( NebulaLog::log("DiM",Log::DEBUG,oss); if (vm->get_state() == VirtualMachine::STOPPED || - vm->get_state() == VirtualMachine::SHUTDOWN_SAVED ) + vm->get_state() == VirtualMachine::UNDEPLOYED ) { vm->set_state(VirtualMachine::PENDING); @@ -858,7 +858,7 @@ int DispatchManager::finalize( break; case VirtualMachine::STOPPED: - case VirtualMachine::SHUTDOWN_SAVED: + case VirtualMachine::UNDEPLOYED: tm->trigger(TransferManager::EPILOG_DELETE_STOP,vid); finalize_cleanup(vm); break; @@ -933,7 +933,7 @@ int DispatchManager::resubmit(int vid) case VirtualMachine::HOLD: // Move the VM to PENDING in any of these case VirtualMachine::STOPPED: - case VirtualMachine::SHUTDOWN_SAVED: + case VirtualMachine::UNDEPLOYED: vm->set_state(VirtualMachine::LCM_INIT); vm->set_state(VirtualMachine::PENDING); diff --git a/src/dm/DispatchManagerStates.cc b/src/dm/DispatchManagerStates.cc index bf868e2308..41817174e0 100644 --- a/src/dm/DispatchManagerStates.cc +++ b/src/dm/DispatchManagerStates.cc @@ -98,7 +98,7 @@ void DispatchManager::stop_success_action(int vid) /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -void DispatchManager::shutdown_save_success_action(int vid) +void DispatchManager::undeploy_success_action(int vid) { VirtualMachine * vm; @@ -110,22 +110,22 @@ void DispatchManager::shutdown_save_success_action(int vid) } if ((vm->get_state() == VirtualMachine::ACTIVE) && - (vm->get_lcm_state() == VirtualMachine::EPILOG_SHUTDOWN_SAVE || - vm->get_lcm_state() == VirtualMachine::PROLOG_SHUTDOWN_SAVE)) + (vm->get_lcm_state() == VirtualMachine::EPILOG_UNDEPLOY || + vm->get_lcm_state() == VirtualMachine::PROLOG_UNDEPLOY)) { - vm->set_state(VirtualMachine::SHUTDOWN_SAVED); + vm->set_state(VirtualMachine::UNDEPLOYED); vm->set_state(VirtualMachine::LCM_INIT); vmpool->update(vm); - vm->log("DiM", Log::INFO, "New VM state is SHUTDOWN_SAVED"); + vm->log("DiM", Log::INFO, "New VM state is UNDEPLOYED"); } else { ostringstream oss; - oss << "shutdown_save_success action received but VM " << vid + oss << "undeploy_success action received but VM " << vid << " not in ACTIVE state"; NebulaLog::log("DiM",Log::ERROR,oss); } diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 62f38b4d51..47eeba6267 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -55,7 +55,7 @@ void LifeCycleManager::deploy_action(int vid) } else if (vm->get_previous_reason() == History::NONE) { - vm_state = VirtualMachine::PROLOG_SHUTDOWN_SAVE; + vm_state = VirtualMachine::PROLOG_UNDEPLOY; tm_action = TransferManager::PROLOG_RESUME; } } @@ -342,7 +342,7 @@ void LifeCycleManager::shutdown_action(int vid) /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -void LifeCycleManager::shutdown_save_action(int vid, bool hard) +void LifeCycleManager::undeploy_action(int vid, bool hard) { VirtualMachine * vm; @@ -360,16 +360,16 @@ void LifeCycleManager::shutdown_save_action(int vid, bool hard) VirtualMachineManager * vmm = nd.get_vmm(); //---------------------------------------------------- - // SHUTDOWN_SAVE STATE + // UNDEPLOYING STATE //---------------------------------------------------- - vm->set_state(VirtualMachine::SHUTDOWN_SAVE); + vm->set_state(VirtualMachine::UNDEPLOYING); vm->set_resched(false); vmpool->update(vm); - vm->log("LCM",Log::INFO,"New VM state is SHUTDOWN_SAVE"); + vm->log("LCM",Log::INFO,"New VM state is UNDEPLOYING"); //---------------------------------------------------- @@ -384,7 +384,7 @@ void LifeCycleManager::shutdown_save_action(int vid, bool hard) } else { - vm->log("LCM", Log::ERROR, "shutdown_save_action, VM in a wrong state."); + vm->log("LCM", Log::ERROR, "undeploy_action, VM in a wrong state."); } vm->unlock(); @@ -809,7 +809,7 @@ void LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag { case VirtualMachine::PROLOG: case VirtualMachine::PROLOG_RESUME: - case VirtualMachine::PROLOG_SHUTDOWN_SAVE: + case VirtualMachine::PROLOG_UNDEPLOY: vm->set_prolog_etime(the_time); vmpool->update_history(vm); diff --git a/src/lcm/LifeCycleManager.cc b/src/lcm/LifeCycleManager.cc index 4acaed690b..bf762928de 100644 --- a/src/lcm/LifeCycleManager.cc +++ b/src/lcm/LifeCycleManager.cc @@ -232,12 +232,12 @@ void LifeCycleManager::trigger(Actions action, int _vid) aname = "SHUTDOWN"; break; - case SHUTDOWN_SAVE: - aname = "SHUTDOWN_SAVE"; + case UNDEPLOY: + aname = "UNDEPLOY"; break; - case SHUTDOWN_SAVE_HARD: - aname = "SHUTDOWN_SAVE_HARD"; + case UNDEPLOY_HARD: + aname = "UNDEPLOY_HARD"; break; case RESTART: @@ -449,13 +449,13 @@ void LifeCycleManager::do_action(const string &action, void * arg) { shutdown_action(vid); } - else if (action == "SHUTDOWN_SAVE") + else if (action == "UNDEPLOY") { - shutdown_save_action(vid, false); + undeploy_action(vid, false); } - else if (action == "SHUTDOWN_SAVE_HARD") + else if (action == "UNDEPLOY_HARD") { - shutdown_save_action(vid, true); + undeploy_action(vid, true); } else if (action == "RESTART") { diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index a1716fffac..45fd36d543 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -514,13 +514,13 @@ void LifeCycleManager::shutdown_success_action(int vid) dm->trigger(DispatchManager::POWEROFF_SUCCESS,vid); } - else if (vm->get_lcm_state() == VirtualMachine::SHUTDOWN_SAVE) + else if (vm->get_lcm_state() == VirtualMachine::UNDEPLOYING) { //---------------------------------------------------- - // EPILOG_SHUTDOWN_SAVE STATE + // EPILOG_UNDEPLOY STATE //---------------------------------------------------- - vm->set_state(VirtualMachine::EPILOG_SHUTDOWN_SAVE); + vm->set_state(VirtualMachine::EPILOG_UNDEPLOY); vm->delete_snapshots(); @@ -534,7 +534,7 @@ void LifeCycleManager::shutdown_success_action(int vid) vmpool->update_history(vm); - vm->log("LCM", Log::INFO, "New VM state is EPILOG_SHUTDOWN_SAVE"); + vm->log("LCM", Log::INFO, "New VM state is EPILOG_UNDEPLOY"); //---------------------------------------------------- @@ -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::SHUTDOWN_SAVE ) + vm->get_lcm_state() == VirtualMachine::UNDEPLOYING ) { //---------------------------------------------------- // RUNNING STATE FROM SHUTDOWN @@ -616,7 +616,7 @@ void LifeCycleManager::prolog_success_action(int vid) lcm_state = vm->get_lcm_state(); if (lcm_state == VirtualMachine::PROLOG || - lcm_state == VirtualMachine::PROLOG_SHUTDOWN_SAVE ) + lcm_state == VirtualMachine::PROLOG_UNDEPLOY ) { action = VirtualMachineManager::DEPLOY; } @@ -724,10 +724,10 @@ void LifeCycleManager::prolog_failure_action(int vid) dm->trigger(DispatchManager::STOP_SUCCESS,vid); } - else if ( state == VirtualMachine::PROLOG_SHUTDOWN_SAVE ) + else if ( state == VirtualMachine::PROLOG_UNDEPLOY ) { //---------------------------------------------------- - // SHUTDOWN_SAVE STATE FROM PROLOG_RESUME + // UNDEPLOY STATE FROM PROLOG_UNDEPLOY //---------------------------------------------------- Nebula& nd = Nebula::instance(); @@ -755,7 +755,7 @@ void LifeCycleManager::prolog_failure_action(int vid) //---------------------------------------------------- - dm->trigger(DispatchManager::SHUTDOWN_SAVE_SUCCESS,vid); + dm->trigger(DispatchManager::UNDEPLOY_SUCCESS,vid); } else { @@ -795,9 +795,9 @@ void LifeCycleManager::epilog_success_action(int vid) { action = DispatchManager::STOP_SUCCESS; } - else if ( state == VirtualMachine::EPILOG_SHUTDOWN_SAVE ) + else if ( state == VirtualMachine::EPILOG_UNDEPLOY ) { - action = DispatchManager::SHUTDOWN_SAVE_SUCCESS; + action = DispatchManager::UNDEPLOY_SUCCESS; } else if ( state == VirtualMachine::EPILOG ) { @@ -899,7 +899,7 @@ void LifeCycleManager::epilog_failure_action(int vid) dm->trigger(DispatchManager::RESUBMIT, vid); } else if ( vm->get_lcm_state() == VirtualMachine::EPILOG_STOP || - vm->get_lcm_state() == VirtualMachine::EPILOG_SHUTDOWN_SAVE || + vm->get_lcm_state() == VirtualMachine::EPILOG_UNDEPLOY || vm->get_lcm_state() == VirtualMachine::EPILOG ) { vm->set_epilog_etime(the_time); @@ -959,13 +959,13 @@ void LifeCycleManager::cancel_success_action(int vid) tm->trigger(TransferManager::EPILOG,vid); } - else if (vm->get_lcm_state() == VirtualMachine::SHUTDOWN_SAVE) + else if (vm->get_lcm_state() == VirtualMachine::UNDEPLOYING) { //---------------------------------------------------- - // EPILOG_SHUTDOWN_SAVE STATE + // EPILOG_UNDEPLOY STATE //---------------------------------------------------- - vm->set_state(VirtualMachine::EPILOG_SHUTDOWN_SAVE); + vm->set_state(VirtualMachine::EPILOG_UNDEPLOY); vm->delete_snapshots(); @@ -979,7 +979,7 @@ void LifeCycleManager::cancel_success_action(int vid) vmpool->update_history(vm); - vm->log("LCM", Log::INFO, "New VM state is EPILOG_SHUTDOWN_SAVE"); + vm->log("LCM", Log::INFO, "New VM state is EPILOG_UNDEPLOY"); //---------------------------------------------------- @@ -1011,7 +1011,7 @@ void LifeCycleManager::cancel_failure_action(int vid) } if ( vm->get_lcm_state() == VirtualMachine::CANCEL || - vm->get_lcm_state() == VirtualMachine::SHUTDOWN_SAVE ) + vm->get_lcm_state() == VirtualMachine::UNDEPLOYING ) { //---------------------------------------------------- // RUNNING STATE FROM CANCEL diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index ecbc63b400..5993032774 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -47,15 +47,14 @@ module OpenNebula } VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED - POWEROFF SHUTDOWN_SAVED} + POWEROFF UNDEPLOYED} LCM_STATE=%w{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_SAVE EPILOG_SHUTDOWN_SAVE - PROLOG_SHUTDOWN_SAVE} + HOTPLUG_SAVEAS_SUSPENDED UNDEPLOYING EPILOG_UNDEPLOY PROLOG_UNDEPLOY} SHORT_VM_STATES={ "INIT" => "init", @@ -67,7 +66,7 @@ module OpenNebula "DONE" => "done", "FAILED" => "fail", "POWEROFF" => "poff", - "SHUTDOWN_SAVED" => "shut" + "UNDEPLOYING" => "unde" } SHORT_LCM_STATES={ @@ -99,9 +98,9 @@ module OpenNebula "HOTPLUG_SAVEAS" => "hotp", "HOTPLUG_SAVEAS_POWEROFF" => "hotp", "HOTPLUG_SAVEAS_SUSPENDED" => "hotp", - "SHUTDOWN_SAVE" => "shut", - "EPILOG_SHUTDOWN_SAVE" => "epil", - "PROLOG_SHUTDOWN_SAVE" => "prol" + "UNDEPLOYING" => "unde", + "EPILOG_UNDEPLOY" => "epil", + "PROLOG_UNDEPLOY" => "prol" } MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL} @@ -215,12 +214,11 @@ module OpenNebula action(hard ? 'shutdown-hard' : 'shutdown') end - # Shutdowns an already deployed VM - def shutdown_save(hard=false) - action(hard ? 'shutdown-save-hard' : 'shutdown-save') + # Shuts down an already deployed VM, saving its state in the system DS + def undeploy(hard=false) + action(hard ? 'undeploy-hard' : 'undeploy') end - # Powers off a running VM def poweroff action('poweroff') diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index 7c1feefce4..66c9acb70d 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -381,13 +381,13 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList, { rc = dm->poweroff(id); } - else if (action == "shutdown-save") + else if (action == "undeploy") { - rc = dm->shutdown_save(id, false); + rc = dm->undeploy(id, false); } - else if (action == "shutdown-save-hard") + else if (action == "undeploy-hard") { - rc = dm->shutdown_save(id, true); + rc = dm->undeploy(id, true); } switch (rc) @@ -1254,7 +1254,7 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList, case VirtualMachine::PENDING: case VirtualMachine::HOLD: case VirtualMachine::FAILED: - case VirtualMachine::SHUTDOWN_SAVED: + case VirtualMachine::UNDEPLOYED: break; case VirtualMachine::STOPPED: @@ -1432,7 +1432,7 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList, case VirtualMachine::HOLD: case VirtualMachine::FAILED: case VirtualMachine::POWEROFF: - case VirtualMachine::SHUTDOWN_SAVED: + case VirtualMachine::UNDEPLOYED: ret = vm->resize(ncpu, nmemory, nvcpu, error_str); if (ret != 0) diff --git a/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc index 7eb3def0c6..b8e93e365b 100644 --- a/src/scheduler/src/pool/VirtualMachineXML.cc +++ b/src/scheduler/src/pool/VirtualMachineXML.cc @@ -296,8 +296,8 @@ int VirtualMachineXML::parse_action_name(string& action_st) if ( action_st != "shutdown" && action_st != "shutdown-hard" - && action_st != "shutdown-save" - && action_st != "shutdown-save-hard" + && action_st != "undeploy" + && action_st != "undeploy-hard" && action_st != "hold" && action_st != "release" && action_st != "stop" diff --git a/src/tm/TransferManagerDriver.cc b/src/tm/TransferManagerDriver.cc index fcfa28bb9f..58c4ddf369 100644 --- a/src/tm/TransferManagerDriver.cc +++ b/src/tm/TransferManagerDriver.cc @@ -122,13 +122,13 @@ void TransferManagerDriver::protocol( case VirtualMachine::PROLOG: case VirtualMachine::PROLOG_MIGRATE: case VirtualMachine::PROLOG_RESUME: - case VirtualMachine::PROLOG_SHUTDOWN_SAVE: + case VirtualMachine::PROLOG_UNDEPLOY: lcm_action = LifeCycleManager::PROLOG_SUCCESS; break; case VirtualMachine::EPILOG: case VirtualMachine::EPILOG_STOP: - case VirtualMachine::EPILOG_SHUTDOWN_SAVE: + case VirtualMachine::EPILOG_UNDEPLOY: case VirtualMachine::CLEANUP_RESUBMIT: lcm_action = LifeCycleManager::EPILOG_SUCCESS; break; @@ -167,13 +167,13 @@ void TransferManagerDriver::protocol( case VirtualMachine::PROLOG: case VirtualMachine::PROLOG_MIGRATE: case VirtualMachine::PROLOG_RESUME: - case VirtualMachine::PROLOG_SHUTDOWN_SAVE: + case VirtualMachine::PROLOG_UNDEPLOY: lcm_action = LifeCycleManager::PROLOG_FAILURE; break; case VirtualMachine::EPILOG: case VirtualMachine::EPILOG_STOP: - case VirtualMachine::EPILOG_SHUTDOWN_SAVE: + case VirtualMachine::EPILOG_UNDEPLOY: case VirtualMachine::CLEANUP_RESUBMIT: lcm_action = LifeCycleManager::EPILOG_FAILURE; break; diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc index 6f4e8cbaf8..f414685138 100644 --- a/src/vmm/VirtualMachineManager.cc +++ b/src/vmm/VirtualMachineManager.cc @@ -903,7 +903,7 @@ error_driver: error_common: if ( vm->get_lcm_state() == VirtualMachine::CANCEL || - vm->get_lcm_state() == VirtualMachine::SHUTDOWN_SAVE ) //not in DELETE + vm->get_lcm_state() == VirtualMachine::UNDEPLOYING ) //not in DELETE { Nebula &ne = Nebula::instance(); LifeCycleManager * lcm = ne.get_lcm();