From 9663408c403e119cb15085621ae7c584b881f285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 26 Feb 2015 18:55:02 +0100
Subject: [PATCH] Bug 3639: Use numeric vm states

---
 src/sunstone/public/js/opennebula.js      | 49 +++++++++++++++++++++++
 src/sunstone/public/js/plugins/vms-tab.js | 26 ++++++------
 src/sunstone/public/js/sunstone.js        |  4 +-
 3 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js
index ee1d4e21a3..8bc0aa09bc 100644
--- a/src/sunstone/public/js/opennebula.js
+++ b/src/sunstone/public/js/opennebula.js
@@ -887,6 +887,55 @@ var OpenNebula = {
     "VM": {
         "resource": "VM",
 
+        "state": {
+            "INIT"      : 0,
+            "PENDING"   : 1,
+            "HOLD"      : 2,
+            "ACTIVE"    : 3,
+            "STOPPED"   : 4,
+            "SUSPENDED" : 5,
+            "DONE"      : 6,
+            "FAILED"    : 7,
+            "POWEROFF"  : 8,
+            "UNDEPLOYED": 9
+        },
+
+        "lcm_state": {
+            "LCM_INIT"            : 0,
+            "PROLOG"              : 1,
+            "BOOT"                : 2,
+            "RUNNING"             : 3,
+            "MIGRATE"             : 4,
+            "SAVE_STOP"           : 5,
+            "SAVE_SUSPEND"        : 6,
+            "SAVE_MIGRATE"        : 7,
+            "PROLOG_MIGRATE"      : 8,
+            "PROLOG_RESUME"       : 9,
+            "EPILOG_STOP"         : 10,
+            "EPILOG"              : 11,
+            "SHUTDOWN"            : 12,
+            "CANCEL"              : 13,
+            "FAILURE"             : 14,
+            "CLEANUP_RESUBMIT"    : 15,
+            "UNKNOWN"             : 16,
+            "HOTPLUG"             : 17,
+            "SHUTDOWN_POWEROFF"   : 18,
+            "BOOT_UNKNOWN"        : 19,
+            "BOOT_POWEROFF"       : 20,
+            "BOOT_SUSPENDED"      : 21,
+            "BOOT_STOPPED"        : 22,
+            "CLEANUP_DELETE"      : 23,
+            "HOTPLUG_SNAPSHOT"    : 24,
+            "HOTPLUG_NIC"         : 25,
+            "HOTPLUG_SAVEAS"           : 26,
+            "HOTPLUG_SAVEAS_POWEROFF"  : 27,
+            "HOTPLUG_SAVEAS_SUSPENDED" : 28,
+            "SHUTDOWN_UNDEPLOY"   : 29,
+            "EPILOG_UNDEPLOY"     : 30,
+            "PROLOG_UNDEPLOY"     : 31,
+            "BOOT_UNDEPLOY"       : 32
+        },
+
         "create": function(params){
             OpenNebula.Action.create(params,OpenNebula.VM.resource);
         },
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index f970394aa6..14effd6309 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -32,19 +32,19 @@ function loadVNC(){
 loadVNC();
 
 var VNCstates=[
-  tr("RUNNING"),
-  tr("SHUTDOWN"),
-  tr("SHUTDOWN_POWEROFF"),
-  tr("UNKNOWN"),
-  tr("HOTPLUG"),
-  tr("CANCEL"),
-  tr("MIGRATE"),
-  tr("HOTPLUG_SNAPSHOT"),
-  tr("HOTPLUG_NIC"),
-  tr("HOTPLUG_SAVEAS"),
-  tr("HOTPLUG_SAVEAS_POWEROFF"),
-  tr("HOTPLUG_SAVEAS_SUSPENDED"),
-  tr("SHUTDOWN_UNDEPLOY")];
+  OpenNebula.VM.lcm_state.RUNNING,
+  OpenNebula.VM.lcm_state.SHUTDOWN,
+  OpenNebula.VM.lcm_state.SHUTDOWN_POWEROFF,
+  OpenNebula.VM.lcm_state.UNKNOWN,
+  OpenNebula.VM.lcm_state.HOTPLUG,
+  OpenNebula.VM.lcm_state.CANCEL,
+  OpenNebula.VM.lcm_state.MIGRATE,
+  OpenNebula.VM.lcm_state.HOTPLUG_SNAPSHOT,
+  OpenNebula.VM.lcm_state.HOTPLUG_NIC,
+  OpenNebula.VM.lcm_state.HOTPLUG_SAVEAS,
+  OpenNebula.VM.lcm_state.HOTPLUG_SAVEAS_POWEROFF,
+  OpenNebula.VM.lcm_state.HOTPLUG_SAVEAS_SUSPENDED,
+  OpenNebula.VM.lcm_state.SHUTDOWN_UNDEPLOY];
 
 //Permanent storage for last value of aggregated network usage
 //Used to calculate bandwidth
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index cc1174caab..e37a0a98e6 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -8379,7 +8379,7 @@ function ip_str(vm, divider){
 // returns true if the vnc button should be enabled
 function enableVnc(vm){
     var graphics = vm.TEMPLATE.GRAPHICS;
-    var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
+    var state = parseInt(vm.LCM_STATE);
 
     return (graphics &&
         graphics.TYPE &&
@@ -8389,7 +8389,7 @@ function enableVnc(vm){
 
 function enableSPICE(vm){
     var graphics = vm.TEMPLATE.GRAPHICS;
-    var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
+    var state = parseInt(vm.LCM_STATE);
 
     return (graphics &&
         graphics.TYPE &&