admin/one
1
0 Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2026-11-10 06:24:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Bug #1210: Add BOOT_STOPPED state to OCA (both Ruby & Java), Sunstone and oZones

Browse Source
This commit is contained in:
Carlos Martín committed 2012-10-17 15:44:21 +02:00
1 parent 04a4fe9606
commit ae8a187534
4 files changed
+10 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
+3 -1
View File
@@ -87,7 +87,8 @@ public class VirtualMachine extends PoolElement{
"SHUTDOWN_POWEROFF",
"BOOT_UNKNOWN",
"BOOT_POWEROFF",
"BOOT_SUSPENDED" };
"BOOT_SUSPENDED",
"BOOT_STOPPED" };
private static final String[] SHORT_LCM_STATES =
{
@@ -112,6 +113,7 @@ public class VirtualMachine extends PoolElement{
"poff",
"boot",
"boot",
"boot",
"boot" };
/**
src/oca/ruby/OpenNebula/VirtualMachine.rb
+3 -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_SUSPENDED}
BOOT_UNKNOWN BOOT_POWEROFF BOOT_SUSPENDED BOOT_STOPPED}
SHORT_VM_STATES={
"INIT" => "init",
@@ -79,7 +79,8 @@ module OpenNebula
"SHUTDOWN_POWEROFF" => "shut",
"BOOT_UNKNOWN" => "boot",
"BOOT_POWEROFF" => "boot",
"BOOT_SUSPENDED" => "boot"
"BOOT_SUSPENDED" => "boot",
"BOOT_STOPPED" => "boot"
}
MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL}
src/ozones/Server/public/js/ozones.js
+2 -1
View File
@@ -100,7 +100,8 @@ var oZones = {
"SHUTDOWN_POWEROFF",
"BOOT_UNKNOWN",
"BOOT_POWEROFF",
"BOOT_SUSPENDED"][value]);
"BOOT_SUSPENDED",
"BOOT_STOPPED"][value]);
break;
case "IMAGE":
case "image":
src/sunstone/public/js/opennebula.js
+2 -1
View File
@@ -108,7 +108,8 @@ var OpenNebula = {
"SHUTDOWN_POWEROFF",
"BOOT_UNKNOWN",
"BOOT_POWEROFF",
"BOOT_SUSPENDED"][value]);
"BOOT_SUSPENDED",
"BOOT_STOPPED"][value]);
break;
case "IMAGE":
case "image":