Revision 5f689eb2

View differences:

share/doc/states/states-complete.dot
19 19
    "ANY \\ {suspended,poweroff,done}" [ shape="box" ];
20 20

  
21 21
    subgraph { rank = min; user}
22
    subgraph { rank = same; boot; boot_stopped; boot_undeploy; boot_suspended; boot_unknown; boot_poweroff; unknown; color="white"}
22
    subgraph { rank = same; boot; boot_stopped; boot_undeploy; boot_suspended; boot_unknown; boot_poweroff; boot_migrate; boot_failure; boot_migrate_failure; unknown; color="white"}
23 23
    subgraph { rank = same; pending; hold; color="white"}
24 24
    subgraph { rank = same; prolog; prolog_resume; prolog_migrate; color="white" }
25 25
//    subgraph { rank = same; prolog; prolog_resume; prolog_migrate; save_migrate; color="white" }
......
68 68
    running         -> save_migrate [label="migrate"];
69 69
    save_migrate    -> prolog_migrate [style="dashed"];
70 70
    save_migrate    -> running [style="dotted"];
71
    prolog_migrate  -> boot [style="dashed"];
71
    prolog_migrate  -> boot_migrate [style="dashed"];
72
    boot_migrate    -> running [style="dashed"];
72 73

  
73 74
#   hold
74 75
    pending     -> hold [label="hold"];
......
118 119
    boot_stopped    -> boot_stopped [label="boot"];
119 120
    boot_poweroff   -> boot_poweroff [label="boot"];
120 121
    boot_undeploy   -> boot_undeploy [label="boot"];
122
    boot_migrate    -> boot_migrate [label="boot"];
121 123

  
122 124
    unknown         -> boot_unknown [label="boot"];
123 125
    boot_unknown    -> boot_unknown [label="boot"];
124 126
    boot_unknown    -> running [style="dashed"];
125 127

  
128
    boot_failure         -> boot [label="boot"];
129
    boot_migrate_failure -> boot_migrate [label="boot"];
130

  
126 131
#   reboot
127 132
    running     -> running [label="reboot"];
128 133

  
......
158 163
    prolog_resume   -> stopped [style="dotted"];
159 164
    prolog_undeploy -> undeployed [style="dotted"];
160 165

  
161
    boot            -> failure [style="dotted"];
166
    boot            -> boot_failure [style="dotted"];
167
    boot_migrate    -> boot_migrate_failure [style="dotted"];
162 168
    boot_poweroff   -> poweroff [style="dotted"];
163 169
    boot_unknown    -> unknown [style="dotted"];
164 170
    boot_suspended  -> suspended [style="dotted"];
share/doc/xsd/acct.xsd
141 141
                SHUTDOWN_UNDEPLOY   = 29,
142 142
                EPILOG_UNDEPLOY     = 30,
143 143
                PROLOG_UNDEPLOY     = 31,
144
                BOOT_UNDEPLOY       = 32
144
                BOOT_UNDEPLOY       = 32,
145
                BOOT_MIGRATE        = 33,
146
                BOOT_FAILURE        = 34,
147
                BOOT_MIGRATE_FAILURE= 35
145 148
              -->
146 149
              <xs:element name="LCM_STATE" type="xs:integer"/>
147 150
              <xs:element name="PREV_STATE" type="xs:integer"/>
share/doc/xsd/vm.xsd
78 78
          SHUTDOWN_UNDEPLOY   = 29,
79 79
          EPILOG_UNDEPLOY     = 30,
80 80
          PROLOG_UNDEPLOY     = 31,
81
          BOOT_UNDEPLOY       = 32
81
          BOOT_UNDEPLOY       = 32,
82
          BOOT_MIGRATE        = 33,
83
          BOOT_FAILURE        = 34,
84
          BOOT_MIGRATE_FAILURE= 35
82 85
        -->
83 86
        <xs:element name="LCM_STATE" type="xs:integer"/>
84 87
        <xs:element name="PREV_STATE" type="xs:integer"/>
src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
109 109
        "SHUTDOWN_UNDEPLOY",
110 110
        "EPILOG_UNDEPLOY",
111 111
        "PROLOG_UNDEPLOY",
112
        "BOOT_UNDEPLOY" };
112
        "BOOT_UNDEPLOY",
113
        "BOOT_MIGRATE",
114
        "BOOT_FAILURE",
115
        "BOOT_MIGRATE_FAILURE" };
113 116

  
114 117
    private static final String[] SHORT_LCM_STATES =
115 118
    {
......
145 148
        "shut",
146 149
        "epil",
147 150
        "prol",
148
        "boot" };
151
        "boot",
152
        "boot",
153
        "fail",
154
        "fail" };
149 155

  
150 156
    /**
151 157
     * Creates a new VM representation.
src/oca/ruby/opennebula/virtual_machine.rb
55 55
            BOOT_UNKNOWN BOOT_POWEROFF BOOT_SUSPENDED BOOT_STOPPED CLEANUP_DELETE
56 56
            HOTPLUG_SNAPSHOT HOTPLUG_NIC HOTPLUG_SAVEAS HOTPLUG_SAVEAS_POWEROFF
57 57
            HOTPLUG_SAVEAS_SUSPENDED SHUTDOWN_UNDEPLOY EPILOG_UNDEPLOY
58
            PROLOG_UNDEPLOY BOOT_UNDEPLOY}
58
            PROLOG_UNDEPLOY BOOT_UNDEPLOY BOOT_MIGRATE BOOT_FAILURE BOOT_MIGRATE_FAILURE}
59 59

  
60 60
        SHORT_VM_STATES={
61 61
            "INIT"      => "init",
......
102 102
            "SHUTDOWN_UNDEPLOY" => "shut",
103 103
            "EPILOG_UNDEPLOY"   => "epil",
104 104
            "PROLOG_UNDEPLOY"   => "prol",
105
            "BOOT_UNDEPLOY"     => "boot"
105
            "BOOT_UNDEPLOY"     => "boot",
106
            "BOOT_MIGRATE"      => "boot",
107
            "BOOT_FAILURE"      => "fail",
108
            "BOOT_MIGRATE_FAILURE" => "fail"
106 109
        }
107 110

  
108 111
        MIGRATE_REASON=%w{NONE ERROR USER}
src/sunstone/OpenNebulaVNC.rb
64 64
        "29"  #SHUTDOWN_UNDEPLOY
65 65
        #30, #EPILOG_UNDEPLOY
66 66
        #31, #PROLOG_UNDEPLOY
67
        #32  #BOOT_UNDEPLOY
67
        #32, #BOOT_UNDEPLOY
68
        #33, #BOOT_MIGRATE
69
        #34, #BOOT_FAILURE
70
        #35, #BOOT_MIGRATE_FAILURE
68 71
]
69 72

  
70 73
class OpenNebulaVNC
src/sunstone/public/js/opennebula.js
150 150
                               "SHUTDOWN",
151 151
                               "EPILOG",
152 152
                               "PROLOG",
153
                               "BOOT"][value]);
153
                               "BOOT",
154
                               "BOOT",
155
                               "FAILURE",
156
                               "FAILURE"][value]);
154 157
                    break;
155 158
                case "IMAGE":
156 159
                case "image":
......
933 936
            "SHUTDOWN_UNDEPLOY"   : 29,
934 937
            "EPILOG_UNDEPLOY"     : 30,
935 938
            "PROLOG_UNDEPLOY"     : 31,
936
            "BOOT_UNDEPLOY"       : 32
939
            "BOOT_UNDEPLOY"       : 32,
940
            "BOOT_MIGRATE"        : 33,
941
            "BOOT_FAILURE"        : 34,
942
            "BOOT_MIGRATE_FAILURE": 35
937 943
        },
938 944

  
939 945
        "create": function(params){
src/sunstone/public/js/plugins/vms-tab.js
145 145
        [],
146 146
    32: //OpenNebula.VM.lcm_state.BOOT_UNDEPLOY:
147 147
        ["VM.boot"],
148
    33: //OpenNebula.VM.lcm_state.BOOT_MIGRATE:
149
        ["VM.boot"],
150
    34: //OpenNebula.VM.lcm_state.BOOT_FAILURE:
151
        ["VM.boot"],
152
    35: //OpenNebula.VM.lcm_state.BOOT_MIGRATE_FAILURE:
153
        ["VM.boot"],
148 154
}
149 155

  
150 156
//Permanent storage for last value of aggregated network usage

Also available in: Unified diff