shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Feature #1224: Minor edits

Browse Source
This commit is contained in:
Carlos Martín 2013-02-21 15:21:31 +01:00
parent 44658d5abf
commit 4391225f7e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/RequestManagerVirtualMachine.h
View File

@ -259,7 +259,7 @@ class VirtualMachineSnapshotDelete: public RequestManagerVirtualMachine
public:
VirtualMachineSnapshotDelete():
RequestManagerVirtualMachine("VirtualMachineSnapshotDelete",
"Deletes a virtual machine to a snapshot",
"Deletes a virtual machine snapshot",
"A:sii"){};
~VirtualMachineSnapshotDelete(){};

5
src/cli/onevm
View File

@ -644,10 +644,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
Reverts a VM to a saved snapshot
EOT
command :"snapshot-revert", snapshot_revert_desc, [:range,:vmid_list],
:snapshot_id do
command :"snapshot-revert", snapshot_revert_desc, :vmid, :snapshot_id do
helper.perform_actions(args[0],options,"snapshot reverted") do |o|
helper.perform_action(args[0],options,"snapshot reverted") do |o|
o.snapshot_revert(args[1].to_i)
end
end

7
src/lcm/LifeCycleStates.cc
View File

@ -1263,7 +1263,7 @@ void LifeCycleManager::snapshot_create_failure(int vid)
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG )
{
vm->clear_active_snapshot();
vm->delete_active_snapshot();
vm->set_state(VirtualMachine::RUNNING);
@ -1296,7 +1296,7 @@ void LifeCycleManager::snapshot_revert_success(int vid)
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG )
{
vm->delete_active_snapshot();
vm->clear_active_snapshot();
vm->set_state(VirtualMachine::RUNNING);
@ -1374,10 +1374,11 @@ void LifeCycleManager::snapshot_delete_failure(int vid)
}
else
{
vm->log("LCM",Log::ERROR,"snapshot_delete_success, VM in a wrong state");
vm->log("LCM",Log::ERROR,"snapshot_delete_failure, VM in a wrong state");
}
vm->unlock();
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */