Revision 728d0435 src/lcm/LifeCycleStates.cc

View differences:

src/lcm/LifeCycleStates.cc
514 514

  
515 515
        dm->trigger(DispatchManager::POWEROFF_SUCCESS,vid);
516 516
    }
517
    else if (vm->get_lcm_state() == VirtualMachine::SHUTDOWN_SAVE)
517
    else if (vm->get_lcm_state() == VirtualMachine::UNDEPLOYING)
518 518
    {
519 519
        //----------------------------------------------------
520
        //            EPILOG_SHUTDOWN_SAVE STATE
520
        //            EPILOG_UNDEPLOY STATE
521 521
        //----------------------------------------------------
522 522

  
523
        vm->set_state(VirtualMachine::EPILOG_SHUTDOWN_SAVE);
523
        vm->set_state(VirtualMachine::EPILOG_UNDEPLOY);
524 524

  
525 525
        vm->delete_snapshots();
526 526

  
......
534 534

  
535 535
        vmpool->update_history(vm);
536 536

  
537
        vm->log("LCM", Log::INFO, "New VM state is EPILOG_SHUTDOWN_SAVE");
537
        vm->log("LCM", Log::INFO, "New VM state is EPILOG_UNDEPLOY");
538 538

  
539 539
        //----------------------------------------------------
540 540

  
......
567 567

  
568 568
    if ( vm->get_lcm_state() == VirtualMachine::SHUTDOWN ||
569 569
         vm->get_lcm_state() == VirtualMachine::SHUTDOWN_POWEROFF ||
570
         vm->get_lcm_state() == VirtualMachine::SHUTDOWN_SAVE )
570
         vm->get_lcm_state() == VirtualMachine::UNDEPLOYING )
571 571
    {
572 572
        //----------------------------------------------------
573 573
        //    RUNNING STATE FROM SHUTDOWN
......
616 616
    lcm_state = vm->get_lcm_state();
617 617

  
618 618
    if (lcm_state == VirtualMachine::PROLOG ||
619
        lcm_state == VirtualMachine::PROLOG_SHUTDOWN_SAVE )
619
        lcm_state == VirtualMachine::PROLOG_UNDEPLOY )
620 620
    {
621 621
        action = VirtualMachineManager::DEPLOY;
622 622
    }
......
724 724

  
725 725
        dm->trigger(DispatchManager::STOP_SUCCESS,vid);
726 726
    }
727
    else if ( state == VirtualMachine::PROLOG_SHUTDOWN_SAVE )
727
    else if ( state == VirtualMachine::PROLOG_UNDEPLOY )
728 728
    {
729 729
        //----------------------------------------------------
730
        //    SHUTDOWN_SAVE STATE FROM PROLOG_RESUME
730
        //    UNDEPLOY STATE FROM PROLOG_UNDEPLOY
731 731
        //----------------------------------------------------
732 732

  
733 733
        Nebula&             nd = Nebula::instance();
......
755 755

  
756 756
        //----------------------------------------------------
757 757

  
758
        dm->trigger(DispatchManager::SHUTDOWN_SAVE_SUCCESS,vid);
758
        dm->trigger(DispatchManager::UNDEPLOY_SUCCESS,vid);
759 759
    }
760 760
    else
761 761
    {
......
795 795
    {
796 796
        action = DispatchManager::STOP_SUCCESS;
797 797
    }
798
    else if ( state == VirtualMachine::EPILOG_SHUTDOWN_SAVE )
798
    else if ( state == VirtualMachine::EPILOG_UNDEPLOY )
799 799
    {
800
        action = DispatchManager::SHUTDOWN_SAVE_SUCCESS;
800
        action = DispatchManager::UNDEPLOY_SUCCESS;
801 801
    }
802 802
    else if ( state == VirtualMachine::EPILOG )
803 803
    {
......
899 899
        dm->trigger(DispatchManager::RESUBMIT, vid);
900 900
    }
901 901
    else if ( vm->get_lcm_state() == VirtualMachine::EPILOG_STOP ||
902
              vm->get_lcm_state() == VirtualMachine::EPILOG_SHUTDOWN_SAVE ||
902
              vm->get_lcm_state() == VirtualMachine::EPILOG_UNDEPLOY ||
903 903
              vm->get_lcm_state() == VirtualMachine::EPILOG )
904 904
    {
905 905
        vm->set_epilog_etime(the_time);
......
959 959

  
960 960
        tm->trigger(TransferManager::EPILOG,vid);
961 961
    }
962
    else if (vm->get_lcm_state() == VirtualMachine::SHUTDOWN_SAVE)
962
    else if (vm->get_lcm_state() == VirtualMachine::UNDEPLOYING)
963 963
    {
964 964
        //----------------------------------------------------
965
        //            EPILOG_SHUTDOWN_SAVE STATE
965
        //            EPILOG_UNDEPLOY STATE
966 966
        //----------------------------------------------------
967 967

  
968
        vm->set_state(VirtualMachine::EPILOG_SHUTDOWN_SAVE);
968
        vm->set_state(VirtualMachine::EPILOG_UNDEPLOY);
969 969

  
970 970
        vm->delete_snapshots();
971 971

  
......
979 979

  
980 980
        vmpool->update_history(vm);
981 981

  
982
        vm->log("LCM", Log::INFO, "New VM state is EPILOG_SHUTDOWN_SAVE");
982
        vm->log("LCM", Log::INFO, "New VM state is EPILOG_UNDEPLOY");
983 983

  
984 984
        //----------------------------------------------------
985 985

  
......
1011 1011
    }
1012 1012

  
1013 1013
    if ( vm->get_lcm_state() == VirtualMachine::CANCEL ||
1014
         vm->get_lcm_state() == VirtualMachine::SHUTDOWN_SAVE )
1014
         vm->get_lcm_state() == VirtualMachine::UNDEPLOYING )
1015 1015
    {
1016 1016
        //----------------------------------------------------
1017 1017
        //    RUNNING STATE FROM CANCEL

Also available in: Unified diff