Merge branch 'bug-1210'

Conflicts:
	share/doc/states/states-complete.dot
This commit is contained in:
Ruben S. Montero committed 2012-10-18 23:40:01 +02:00
commit ea98ae0bc8
12 files changed
+131 -23

No files matched your search

@@ -86,7 +86,9 @@ public class VirtualMachine extends PoolElement{
"HOTPLUG",
"SHUTDOWN_POWEROFF",
"BOOT_UNKNOWN",
"BOOT_POWEROFF" };
"BOOT_POWEROFF",
"BOOT_SUSPENDED",
"BOOT_STOPPED" };
private static final String[] SHORT_LCM_STATES =
{
@@ -110,6 +112,8 @@ public class VirtualMachine extends PoolElement{
"hotp",
"poff",
"boot",
"boot",
"boot",
"boot" };
/**
+4 -2
View File
@@ -44,7 +44,7 @@ module OpenNebula
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 UNKNOWN HOTPLUG SHUTDOWN_POWEROFF
BOOT_UNKNOWN BOOT_POWEROFF}
BOOT_UNKNOWN BOOT_POWEROFF BOOT_SUSPENDED BOOT_STOPPED}
SHORT_VM_STATES={
"INIT" => "init",
@@ -78,7 +78,9 @@ module OpenNebula
"HOTPLUG" => "hotp",
"SHUTDOWN_POWEROFF" => "shut",
"BOOT_UNKNOWN" => "boot",
"BOOT_POWEROFF" => "boot"
"BOOT_POWEROFF" => "boot",
"BOOT_SUSPENDED" => "boot",
"BOOT_STOPPED" => "boot"
}
MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL}