diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index ffb5d20c8e..ef671e1374 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -158,12 +158,15 @@ public:
BOOT_STOPPED_FAILURE = 48,
PROLOG_RESUME_FAILURE = 49,
PROLOG_UNDEPLOY_FAILURE = 50,
- DISK_SNAPSHOT_POWEROFF = 51,
- DISK_SNAPSHOT_REVERT_POWEROFF = 52,
- DISK_SNAPSHOT_DELETE_POWEROFF = 53,
- DISK_SNAPSHOT_SUSPENDED = 54,
+ DISK_SNAPSHOT_POWEROFF = 51,
+ DISK_SNAPSHOT_REVERT_POWEROFF = 52,
+ DISK_SNAPSHOT_DELETE_POWEROFF = 53,
+ DISK_SNAPSHOT_SUSPENDED = 54,
DISK_SNAPSHOT_REVERT_SUSPENDED = 55,
- DISK_SNAPSHOT_DELETE_SUSPENDED = 56
+ DISK_SNAPSHOT_DELETE_SUSPENDED = 56,
+ DISK_SNAPSHOT = 57,
+ DISK_SNAPSHOT_REVERT = 58,
+ DISK_SNAPSHOT_DELETE = 59
};
static int lcm_state_from_str(string& st, LcmState& state)
@@ -225,6 +228,9 @@ public:
else if ( st == "DISK_SNAPSHOT_SUSPENDED") { state = DISK_SNAPSHOT_SUSPENDED; }
else if ( st == "DISK_SNAPSHOT_REVERT_SUSPENDED") { state = DISK_SNAPSHOT_REVERT_SUSPENDED; }
else if ( st == "DISK_SNAPSHOT_DELETE_SUSPENDED") { state = DISK_SNAPSHOT_DELETE_SUSPENDED; }
+ else if ( st == "DISK_SNAPSHOT") { state = DISK_SNAPSHOT; }
+ else if ( st == "DISK_SNAPSHOT_REVERT") { state = DISK_SNAPSHOT_REVERT; }
+ else if ( st == "DISK_SNAPSHOT_DELETE") { state = DISK_SNAPSHOT_DELETE; }
else {return -1;}
return 0;
@@ -289,6 +295,9 @@ public:
case DISK_SNAPSHOT_SUSPENDED: st = "DISK_SNAPSHOT_SUSPENDED"; break;
case DISK_SNAPSHOT_REVERT_SUSPENDED: st = "DISK_SNAPSHOT_REVERT_SUSPENDED"; break;
case DISK_SNAPSHOT_DELETE_SUSPENDED: st = "DISK_SNAPSHOT_DELETE_SUSPENDED"; break;
+ case DISK_SNAPSHOT: st = "DISK_SNAPSHOT"; break;
+ case DISK_SNAPSHOT_REVERT: st = "DISK_SNAPSHOT_REVERT"; break;
+ case DISK_SNAPSHOT_DELETE: st = "DISK_SNAPSHOT_DELETE"; break;
}
return st;
diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd
index 023fff1bd6..3484f2cbae 100644
--- a/share/doc/xsd/acct.xsd
+++ b/share/doc/xsd/acct.xsd
@@ -164,12 +164,15 @@
BOOT_STOPPED_FAILURE = 48,
PROLOG_RESUME_FAILURE = 49,
PROLOG_UNDEPLOY_FAILURE = 50,
- DISK_SNAPSHOT_POWEROFF = 51,
- DISK_SNAPSHOT_REVERT_POWEROFF = 52,
- DISK_SNAPSHOT_DELETE_POWEROFF = 53,
- DISK_SNAPSHOT_SUSPENDED = 54,
+ DISK_SNAPSHOT_POWEROFF = 51,
+ DISK_SNAPSHOT_REVERT_POWEROFF = 52,
+ DISK_SNAPSHOT_DELETE_POWEROFF = 53,
+ DISK_SNAPSHOT_SUSPENDED = 54,
DISK_SNAPSHOT_REVERT_SUSPENDED = 55,
- DISK_SNAPSHOT_DELETE_SUSPENDED = 56
+ DISK_SNAPSHOT_DELETE_SUSPENDED = 56,
+ DISK_SNAPSHOT = 57,
+ DISK_SNAPSHOT_REVERT = 58,
+ DISK_SNAPSHOT_DELETE = 59
-->
diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd
index 8debc2c7c1..d613aa3e97 100644
--- a/share/doc/xsd/vm.xsd
+++ b/share/doc/xsd/vm.xsd
@@ -97,9 +97,15 @@
BOOT_STOPPED_FAILURE = 48,
PROLOG_RESUME_FAILURE = 49,
PROLOG_UNDEPLOY_FAILURE = 50,
- DISK_SNAPSHOT_POWEROFF = 51,
+ DISK_SNAPSHOT_POWEROFF = 51,
DISK_SNAPSHOT_REVERT_POWEROFF = 52,
- DISK_SNAPSHOT_DELETE_POWEROFF = 53
+ DISK_SNAPSHOT_DELETE_POWEROFF = 53,
+ DISK_SNAPSHOT_SUSPENDED = 54,
+ DISK_SNAPSHOT_REVERT_SUSPENDED = 55,
+ DISK_SNAPSHOT_DELETE_SUSPENDED = 56,
+ DISK_SNAPSHOT = 57,
+ DISK_SNAPSHOT_REVERT = 58,
+ DISK_SNAPSHOT_DELETE = 59
-->
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index f8a1775b03..2229f0ae13 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -1878,10 +1878,10 @@ int DispatchManager::disk_snapshot_delete(
vm->set_state(VirtualMachine::DISK_SNAPSHOT_DELETE_SUSPENDED);
break;
- //case VirtualMachine::ACTIVE:
- // vm->set_state(VirtualMachine::ACTIVE);
- // vm->set_state(VirtualMachine::DISK_SNAPSHOT_DELETE);
- // break;
+ case VirtualMachine::ACTIVE:
+ vm->set_state(VirtualMachine::ACTIVE);
+ vm->set_state(VirtualMachine::DISK_SNAPSHOT_DELETE);
+ break;
default: break;
}
@@ -1894,13 +1894,10 @@ int DispatchManager::disk_snapshot_delete(
{
case VirtualMachine::POWEROFF:
case VirtualMachine::SUSPENDED:
+ case VirtualMachine::ACTIVE:
tm->trigger(TransferManager::SNAPSHOT_DELETE, vid);
break;
- //case VirtualMachine::ACTIVE:
- // vmm->trigger(VirtualMachineManager::DISK_SNAPSHOT_DELETE, vid);
- // break;
-
default: break;
}
diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc
index b806f0ab90..e05658b7a2 100644
--- a/src/lcm/LifeCycleActions.cc
+++ b/src/lcm/LifeCycleActions.cc
@@ -974,6 +974,7 @@ void LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag
case VirtualMachine::DISK_SNAPSHOT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_REVERT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_DELETE_SUSPENDED:
+ case VirtualMachine::DISK_SNAPSHOT_DELETE:
vm->clear_snapshot_disk();
vmpool->update(vm);
@@ -981,6 +982,18 @@ void LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag
tm->trigger(TransferManager::EPILOG_DELETE,vid);
break;
+ case VirtualMachine::DISK_SNAPSHOT:
+ case VirtualMachine::DISK_SNAPSHOT_REVERT:
+ vm->clear_snapshot_disk();
+ vmpool->update(vm);
+
+ vm->set_running_etime(the_time);
+ vmpool->update_history(vm);
+
+ vmm->trigger(VirtualMachineManager::DRIVER_CANCEL,vid);
+ vmm->trigger(VirtualMachineManager::CLEANUP,vid);
+ break;
+
case VirtualMachine::MIGRATE:
vm->set_running_etime(the_time);
vmpool->update_history(vm);
@@ -1253,7 +1266,17 @@ void LifeCycleManager::recover(VirtualMachine * vm, bool success)
case VirtualMachine::DISK_SNAPSHOT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_REVERT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_DELETE_SUSPENDED:
- lcm_action = LifeCycleManager::DISK_SNAPSHOT_FAILURE;
+ case VirtualMachine::DISK_SNAPSHOT:
+ case VirtualMachine::DISK_SNAPSHOT_REVERT:
+ case VirtualMachine::DISK_SNAPSHOT_DELETE:
+ if (success)
+ {
+ lcm_action = LifeCycleManager::DISK_SNAPSHOT_SUCCESS;
+ }
+ else
+ {
+ lcm_action = LifeCycleManager::DISK_SNAPSHOT_FAILURE;
+ }
break;
}
@@ -1461,6 +1484,9 @@ void LifeCycleManager::retry(VirtualMachine * vm)
case VirtualMachine::DISK_SNAPSHOT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_REVERT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_DELETE_SUSPENDED:
+ case VirtualMachine::DISK_SNAPSHOT:
+ case VirtualMachine::DISK_SNAPSHOT_REVERT:
+ case VirtualMachine::DISK_SNAPSHOT_DELETE:
case VirtualMachine::RUNNING:
case VirtualMachine::UNKNOWN:
break;
diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc
index 2fad0dc0db..c7388417a6 100644
--- a/src/lcm/LifeCycleStates.cc
+++ b/src/lcm/LifeCycleStates.cc
@@ -1736,8 +1736,6 @@ void LifeCycleManager::disk_snapshot_success(int vid)
{
vm->log("LCM", Log::ERROR, "Snapshot DISK could not be found");
- dm->trigger(DispatchManager::POWEROFF_SUCCESS, vid);
-
vm->unlock();
return;
@@ -1761,6 +1759,8 @@ void LifeCycleManager::disk_snapshot_success(int vid)
vm->revert_disk_snapshot(idisk_id, isnap_id);
break;
+ case VirtualMachine::DISK_SNAPSHOT_DELETE:
+ vm->set_state(VirtualMachine::RUNNING);
case VirtualMachine::DISK_SNAPSHOT_DELETE_POWEROFF:
case VirtualMachine::DISK_SNAPSHOT_DELETE_SUSPENDED:
vm->log("LCM", Log::INFO, "VM disk snapshot deleted.");
@@ -1775,10 +1775,10 @@ void LifeCycleManager::disk_snapshot_success(int vid)
vm->clear_snapshot_disk();
- vm->unlock();
-
vmpool->update(vm);
+ vm->unlock();
+
if ( quotas != 0 )
{
Quotas::quota_del(qt, uid, gid, quotas);
@@ -1828,8 +1828,6 @@ void LifeCycleManager::disk_snapshot_failure(int vid)
{
vm->log("LCM", Log::ERROR, "Snapshot DISK could not be found");
- dm->trigger(DispatchManager::POWEROFF_SUCCESS, vid);
-
vm->unlock();
return;
@@ -1851,6 +1849,8 @@ void LifeCycleManager::disk_snapshot_failure(int vid)
vm->delete_disk_snapshot(idisk_id, isnap_id, qt, "as);
break;
+ case VirtualMachine::DISK_SNAPSHOT_DELETE:
+ vm->set_state(VirtualMachine::RUNNING);
case VirtualMachine::DISK_SNAPSHOT_DELETE_POWEROFF:
case VirtualMachine::DISK_SNAPSHOT_REVERT_POWEROFF:
case VirtualMachine::DISK_SNAPSHOT_DELETE_SUSPENDED:
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 da89196ce1..c7ef6822b7 100644
--- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
+++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
@@ -133,7 +133,10 @@ public class VirtualMachine extends PoolElement{
"DISK_SNAPSHOT_DELETE_POWEROFF",
"DISK_SNAPSHOT_SUSPENDED",
"DISK_SNAPSHOT_REVERT_SUSPENDED",
- "DISK_SNAPSHOT_DELETE_SUSPENDED"
+ "DISK_SNAPSHOT_DELETE_SUSPENDED",
+ "DISK_SNAPSHOT",
+ "DISK_SNAPSHOT_REVERT",
+ "DISK_SNAPSHOT_DELETE"
};
private static final String[] SHORT_LCM_STATES =
@@ -194,7 +197,10 @@ public class VirtualMachine extends PoolElement{
"snap", // DISK_SNAPSHOT_DELETE_POWEROFF
"snap", // DISK_SNAPSHOT_SUSPENDED
"snap", // DISK_SNAPSHOT_REVERT_SUSPENDED
- "snap" // DISK_SNAPSHOT_DELETE_SUSPENDED
+ "snap", // DISK_SNAPSHOT_DELETE_SUSPENDED
+ "snap", // DISK_SNAPSHOT
+ "snap", // DISK_SNAPSHOT_REVERT
+ "snap" // DISK_SNAPSHOT_DELETE
};
/**
diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb
index de93e35291..31776435a6 100644
--- a/src/oca/ruby/opennebula/virtual_machine.rb
+++ b/src/oca/ruby/opennebula/virtual_machine.rb
@@ -110,6 +110,9 @@ module OpenNebula
DISK_SNAPSHOT_SUSPENDED
DISK_SNAPSHOT_REVERT_SUSPENDED
DISK_SNAPSHOT_DELETE_SUSPENDED
+ DISK_SNAPSHOT
+ DISK_SNAPSHOT_REVERT
+ DISK_SNAPSHOT_DELETE
}
SHORT_VM_STATES={
@@ -181,7 +184,10 @@ module OpenNebula
"DISK_SNAPSHOT_DELETE_POWEROFF" => "snap",
"DISK_SNAPSHOT_SUSPENDED" => "snap",
"DISK_SNAPSHOT_REVERT_SUSPENDED"=> "snap",
- "DISK_SNAPSHOT_DELETE_SUSPENDED"=> "snap"
+ "DISK_SNAPSHOT_DELETE_SUSPENDED"=> "snap",
+ "DISK_SNAPSHOT" => "snap",
+ "DISK_SNAPSHOT_REVERT" => "snap",
+ "DISK_SNAPSHOT_DELETE" => "snap"
}
MIGRATE_REASON=%w{NONE ERROR USER}
diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb
index 39e3a7e142..6a24c7e222 100644
--- a/src/sunstone/OpenNebulaVNC.rb
+++ b/src/sunstone/OpenNebulaVNC.rb
@@ -89,6 +89,9 @@ VNC_STATES = [
#54, #DISK_SNAPSHOT_SUSPENDED
#55, #DISK_SNAPSHOT_REVERT_SUSPENDED
#56, #DISK_SNAPSHOT_DELETE_SUSPENDED
+ #57, #DISK_SNAPSHOT
+ #58, #DISK_SNAPSHOT_REVERT
+ #59 #DISK_SNAPSHOT_DELETE
]
class OpenNebulaVNC
diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js
index 77dc1bc39d..8080095c38 100644
--- a/src/sunstone/public/app/opennebula/vm.js
+++ b/src/sunstone/public/app/opennebula/vm.js
@@ -90,6 +90,9 @@ define(function(require) {
"DISK_SNAPSHOT_SUSPENDED",
"DISK_SNAPSHOT_REVERT_SUSPENDED",
"DISK_SNAPSHOT_DELETE_SUSPENDED",
+ "DISK_SNAPSHOT",
+ "DISK_SNAPSHOT_REVERT",
+ "DISK_SNAPSHOT_DELETE",
];
var LCM_STATES = {
@@ -149,7 +152,10 @@ define(function(require) {
DISK_SNAPSHOT_DELETE_POWEROFF : 53,
DISK_SNAPSHOT_SUSPENDED : 54,
DISK_SNAPSHOT_REVERT_SUSPENDED : 55,
- DISK_SNAPSHOT_DELETE_SUSPENDED : 56
+ DISK_SNAPSHOT_DELETE_SUSPENDED : 56,
+ DISK_SNAPSHOT : 57,
+ DISK_SNAPSHOT_REVERT : 58,
+ DISK_SNAPSHOT_DELETE : 59
};
var SHORT_LCM_STATES_STR = [
@@ -210,6 +216,9 @@ define(function(require) {
Locale.tr("SNAPSHOT"), // DISK_SNAPSHOT_SUSPENDED
Locale.tr("SNAPSHOT"), // DISK_SNAPSHOT_REVERT_SUSPENDED
Locale.tr("SNAPSHOT"), // DISK_SNAPSHOT_DELETE_SUSPENDED
+ Locale.tr("SNAPSHOT"), // DISK_SNAPSHOT
+ Locale.tr("SNAPSHOT"), // DISK_SNAPSHOT_REVERT
+ Locale.tr("SNAPSHOT"), // DISK_SNAPSHOT_DELETE
];
var VNC_STATES = [
diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
index 5784feecd0..828e1052ae 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
@@ -853,6 +853,9 @@ define(function(require) {
case OpenNebulaVM.LCM_STATES.DISK_SNAPSHOT_SUSPENDED:
case OpenNebulaVM.LCM_STATES.DISK_SNAPSHOT_REVERT_SUSPENDED:
case OpenNebulaVM.LCM_STATES.DISK_SNAPSHOT_DELETE_SUSPENDED:
+ case OpenNebulaVM.LCM_STATES.DISK_SNAPSHOT:
+ case OpenNebulaVM.LCM_STATES.DISK_SNAPSHOT_REVERT:
+ case OpenNebulaVM.LCM_STATES.DISK_SNAPSHOT_DELETE:
case OpenNebulaVM.LCM_STATES.MIGRATE:
case OpenNebulaVM.LCM_STATES.PROLOG_MIGRATE:
case OpenNebulaVM.LCM_STATES.PROLOG_MIGRATE_POWEROFF:
diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js b/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js
index 7995c26379..cdb7158dbd 100644
--- a/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js
+++ b/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js
@@ -94,6 +94,9 @@ define(function(require) {
// TODO DISK_SNAPSHOT_SUSPENDED
// TODO DISK_SNAPSHOT_REVERT_SUSPENDED
// TODO DISK_SNAPSHOT_DELETE_SUSPENDED
+ // TODO DISK_SNAPSHOT
+ // TODO DISK_SNAPSHOT_REVERT
+ // TODO DISK_SNAPSHOT_DELETE
return {
'disableAllStateActions': disableAllStateActions,
diff --git a/src/tm/TransferManagerDriver.cc b/src/tm/TransferManagerDriver.cc
index 1fdda9dd54..5689a722fb 100644
--- a/src/tm/TransferManagerDriver.cc
+++ b/src/tm/TransferManagerDriver.cc
@@ -153,6 +153,7 @@ void TransferManagerDriver::protocol(const string& message) const
case VirtualMachine::DISK_SNAPSHOT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_REVERT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_DELETE_SUSPENDED:
+ case VirtualMachine::DISK_SNAPSHOT_DELETE:
lcm_action = LifeCycleManager::DISK_SNAPSHOT_SUCCESS;
break;
@@ -217,6 +218,7 @@ void TransferManagerDriver::protocol(const string& message) const
case VirtualMachine::DISK_SNAPSHOT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_REVERT_SUSPENDED:
case VirtualMachine::DISK_SNAPSHOT_DELETE_SUSPENDED:
+ case VirtualMachine::DISK_SNAPSHOT_DELETE:
lcm_action = LifeCycleManager::DISK_SNAPSHOT_FAILURE;
break;