Revision 728d0435 src/dm/DispatchManagerActions.cc

View differences:

src/dm/DispatchManagerActions.cc
209 209
/* -------------------------------------------------------------------------- */
210 210
/* -------------------------------------------------------------------------- */
211 211

  
212
int DispatchManager::shutdown_save(
212
int DispatchManager::undeploy(
213 213
    int vid,
214 214
    bool hard)
215 215
{
......
234 234

  
235 235
        if (hard)
236 236
        {
237
            lcm->trigger(LifeCycleManager::SHUTDOWN_SAVE_HARD,vid);
237
            lcm->trigger(LifeCycleManager::UNDEPLOY_HARD,vid);
238 238
        }
239 239
        else
240 240
        {
241
            lcm->trigger(LifeCycleManager::SHUTDOWN_SAVE,vid);
241
            lcm->trigger(LifeCycleManager::UNDEPLOY,vid);
242 242
        }
243 243
    }
244 244
    else
......
551 551
    NebulaLog::log("DiM",Log::DEBUG,oss);
552 552

  
553 553
    if (vm->get_state() == VirtualMachine::STOPPED ||
554
        vm->get_state() == VirtualMachine::SHUTDOWN_SAVED )
554
        vm->get_state() == VirtualMachine::UNDEPLOYED )
555 555
    {
556 556
        vm->set_state(VirtualMachine::PENDING);
557 557

  
......
858 858
        break;
859 859

  
860 860
        case VirtualMachine::STOPPED:
861
        case VirtualMachine::SHUTDOWN_SAVED:
861
        case VirtualMachine::UNDEPLOYED:
862 862
            tm->trigger(TransferManager::EPILOG_DELETE_STOP,vid);
863 863
            finalize_cleanup(vm);
864 864
        break;
......
933 933

  
934 934
        case VirtualMachine::HOLD: // Move the VM to PENDING in any of these
935 935
        case VirtualMachine::STOPPED:
936
        case VirtualMachine::SHUTDOWN_SAVED:
936
        case VirtualMachine::UNDEPLOYED:
937 937
            vm->set_state(VirtualMachine::LCM_INIT);
938 938
            vm->set_state(VirtualMachine::PENDING);
939 939

  

Also available in: Unified diff