Revision 728d0435 src/lcm/LifeCycleActions.cc

View differences:

src/lcm/LifeCycleActions.cc
55 55
            }
56 56
            else if (vm->get_previous_reason() == History::NONE)
57 57
            {
58
                vm_state  = VirtualMachine::PROLOG_SHUTDOWN_SAVE;
58
                vm_state  = VirtualMachine::PROLOG_UNDEPLOY;
59 59
                tm_action = TransferManager::PROLOG_RESUME;
60 60
            }
61 61
        }
......
342 342
/* -------------------------------------------------------------------------- */
343 343
/* -------------------------------------------------------------------------- */
344 344

  
345
void  LifeCycleManager::shutdown_save_action(int vid, bool hard)
345
void  LifeCycleManager::undeploy_action(int vid, bool hard)
346 346
{
347 347
    VirtualMachine *    vm;
348 348

  
......
360 360
        VirtualMachineManager * vmm = nd.get_vmm();
361 361

  
362 362
        //----------------------------------------------------
363
        //             SHUTDOWN_SAVE STATE
363
        //             UNDEPLOYING STATE
364 364
        //----------------------------------------------------
365 365

  
366
        vm->set_state(VirtualMachine::SHUTDOWN_SAVE);
366
        vm->set_state(VirtualMachine::UNDEPLOYING);
367 367

  
368 368
        vm->set_resched(false);
369 369

  
370 370
        vmpool->update(vm);
371 371

  
372
        vm->log("LCM",Log::INFO,"New VM state is SHUTDOWN_SAVE");
372
        vm->log("LCM",Log::INFO,"New VM state is UNDEPLOYING");
373 373

  
374 374
        //----------------------------------------------------
375 375

  
......
384 384
    }
385 385
    else
386 386
    {
387
        vm->log("LCM", Log::ERROR, "shutdown_save_action, VM in a wrong state.");
387
        vm->log("LCM", Log::ERROR, "undeploy_action, VM in a wrong state.");
388 388
    }
389 389

  
390 390
    vm->unlock();
......
809 809
    {
810 810
        case VirtualMachine::PROLOG:
811 811
        case VirtualMachine::PROLOG_RESUME:
812
        case VirtualMachine::PROLOG_SHUTDOWN_SAVE:
812
        case VirtualMachine::PROLOG_UNDEPLOY:
813 813
            vm->set_prolog_etime(the_time);
814 814
            vmpool->update_history(vm);
815 815

  

Also available in: Unified diff