shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00
Code Releases Wiki Activity

feature #1685: Better management of delete/resubmit on CLEANUP_DELETE state. Add new state to OCA bindings

Browse Source
This commit is contained in:
Ruben S. Montero 2013-01-22 13:50:09 +01:00
parent 68b73989fb
commit 5fb5d9cebe
5 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lcm/LifeCycleActions.cc
View File

@ -598,6 +598,7 @@ void LifeCycleManager::delete_action(int vid)
break;
case VirtualMachine::CLEANUP_RESUBMIT:
case VirtualMachine::CLEANUP_DELETE:
vm->set_state(VirtualMachine::CLEANUP_DELETE);
vmpool->update(vm);

8
src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
View File

@ -83,14 +83,15 @@ public class VirtualMachine extends PoolElement{
"SHUTDOWN",
"CANCEL",
"FAILURE",
"CLEANUP",
"CLEANUP_RESUBMIT",
"UNKNOWN",
"HOTPLUG",
"SHUTDOWN_POWEROFF",
"BOOT_UNKNOWN",
"BOOT_POWEROFF",
"BOOT_SUSPENDED",
"BOOT_STOPPED" };
"BOOT_STOPPED",
"CLEANUP_DELETE" };
private static final String[] SHORT_LCM_STATES =
{
@ -116,7 +117,8 @@ public class VirtualMachine extends PoolElement{
"boot",
"boot",
"boot",
"boot" };
"boot",
"clea" };
/**
* Creates a new VM representation.

47
src/oca/ruby/opennebula/virtual_machine.rb
View File

@ -45,8 +45,8 @@ 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_STOPPED}
SHUTDOWN CANCEL FAILURE CLEANUP_RESUBMIT UNKNOWN HOTPLUG SHUTDOWN_POWEROFF
BOOT_UNKNOWN BOOT_POWEROFF BOOT_SUSPENDED BOOT_STOPPED CLEANUP_DELETE}
SHORT_VM_STATES={
"INIT" => "init",
@ -61,28 +61,29 @@ module OpenNebula
}
SHORT_LCM_STATES={
"PROLOG" => "prol",
"BOOT" => "boot",
"RUNNING" => "runn",
"MIGRATE" => "migr",
"SAVE_STOP" => "save",
"SAVE_SUSPEND" => "save",
"SAVE_MIGRATE" => "save",
"PROLOG_MIGRATE"=> "migr",
"PROLOG_RESUME" => "prol",
"EPILOG_STOP" => "epil",
"EPILOG" => "epil",
"SHUTDOWN" => "shut",
"CANCEL" => "shut",
"FAILURE" => "fail",
"CLEANUP" => "clea",
"UNKNOWN" => "unkn",
"HOTPLUG" => "hotp",
"PROLOG" => "prol",
"BOOT" => "boot",
"RUNNING" => "runn",
"MIGRATE" => "migr",
"SAVE_STOP" => "save",
"SAVE_SUSPEND" => "save",
"SAVE_MIGRATE" => "save",
"PROLOG_MIGRATE" => "migr",
"PROLOG_RESUME" => "prol",
"EPILOG_STOP" => "epil",
"EPILOG" => "epil",
"SHUTDOWN" => "shut",
"CANCEL" => "shut",
"FAILURE" => "fail",
"CLEANUP_RESUBMIT" => "clea",
"UNKNOWN" => "unkn",
"HOTPLUG" => "hotp",
"SHUTDOWN_POWEROFF" => "shut",
"BOOT_UNKNOWN" => "boot",
"BOOT_POWEROFF" => "boot",
"BOOT_SUSPENDED" => "boot",
"BOOT_STOPPED" => "boot"
"BOOT_UNKNOWN" => "boot",
"BOOT_POWEROFF" => "boot",
"BOOT_SUSPENDED" => "boot",
"BOOT_STOPPED" => "boot",
"CLEANUP_DELETE" => "clea"
}
MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL}

5
src/ozones/Server/public/js/ozones.js
View File

@ -94,14 +94,15 @@ var oZones = {
"SHUTDOWN",
"CANCEL",
"FAILURE",
"CLEANUP",
"CLEANUP_RESUBMIT",
"UNKNOWN",
"HOTPLUG",
"SHUTDOWN_POWEROFF",
"BOOT_UNKNOWN",
"BOOT_POWEROFF",
"BOOT_SUSPENDED",
"BOOT_STOPPED"][value]);
"BOOT_STOPPED",
"CLEANUP_DELETE"][value]);
break;
case "IMAGE":
case "image":

5
src/sunstone/public/js/opennebula.js
View File

@ -102,14 +102,15 @@ var OpenNebula = {
"SHUTDOWN",
"CANCEL",
"FAILURE",
"CLEANUP",
"CLEANUP_RESUBMIT",
"UNKNOWN",
"HOTPLUG",
"SHUTDOWN_POWEROFF",
"BOOT_UNKNOWN",
"BOOT_POWEROFF",
"BOOT_SUSPENDED",
"BOOT_STOPPED"][value]);
"BOOT_STOPPED",
"CLEANUP_DELETE"][value]);
break;
case "IMAGE":
case "image":