From ae8a187534f7cfd7490303866ceb4cf36bb7e2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Wed, 17 Oct 2012 15:44:21 +0200
Subject: [PATCH] Bug #1210: Add BOOT_STOPPED state to OCA (both Ruby & Java),
 Sunstone and oZones

---
 .../java/src/org/opennebula/client/vm/VirtualMachine.java    | 4 +++-
 src/oca/ruby/OpenNebula/VirtualMachine.rb                    | 5 +++--
 src/ozones/Server/public/js/ozones.js                        | 3 ++-
 src/sunstone/public/js/opennebula.js                         | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
index fb88888e6c..d402c835d2 100644
--- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
+++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
@@ -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" };
 
     /**
diff --git a/src/oca/ruby/OpenNebula/VirtualMachine.rb b/src/oca/ruby/OpenNebula/VirtualMachine.rb
index 8ef1c1c8d3..5e7c061c8b 100644
--- a/src/oca/ruby/OpenNebula/VirtualMachine.rb
+++ b/src/oca/ruby/OpenNebula/VirtualMachine.rb
@@ -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}
diff --git a/src/ozones/Server/public/js/ozones.js b/src/ozones/Server/public/js/ozones.js
index 5b4630dc26..3a1d54501a 100644
--- a/src/ozones/Server/public/js/ozones.js
+++ b/src/ozones/Server/public/js/ozones.js
@@ -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":
diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js
index 16dc8407d0..5c1f5d53c4 100644
--- a/src/sunstone/public/js/opennebula.js
+++ b/src/sunstone/public/js/opennebula.js
@@ -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":