shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-23 21:57:43 +03:00
Code Releases Wiki Activity

Merge branch 'master' of dsa-research.org:one

Browse Source
This commit is contained in:
Ruben S. Montero 2010-07-26 19:41:06 +02:00
commit aa33d18c9e
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/etc/oned.conf
View File

@ -265,7 +265,7 @@ HM_MAD = [
VM_HOOK = [ VM_HOOK = [
name = "image", name = "image",
on = "SHUTDOWN", on = "DONE",
command = "[HOOKS_LOCATION]/image.rb", command = "[HOOKS_LOCATION]/image.rb",
arguments = "$VMID" ] arguments = "$VMID" ]

7
share/hooks/image.rb
View File

@ -47,12 +47,7 @@ vm.each('TEMPLATE/DISK') do |disk|
disk_id = disk["DISK_ID"] disk_id = disk["DISK_ID"]
source_path = VMDIR+"/#{vm_id}/disk.#{disk_id}" source_path = VMDIR+"/#{vm_id}/disk.#{disk_id}"
image_id = nil if image_id = disk["SAVE_AS"]
if disk["SAVE_AS"]
image_id = disk["SAVE_AS"]
end
if image_id and source_path
image=Image.new( image=Image.new(
Image.build_xml(image_id), Image.build_xml(image_id),
client) client)

9
src/rm/RequestManagerImageEnable.cc
View File

@ -29,6 +29,7 @@ void RequestManager::ImageEnable::execute(
xmlrpc_c::value * const retval) xmlrpc_c::value * const retval)
{ {
string session; string session;
string err_msg;
int iid; int iid;
bool enable_flag; bool enable_flag;
@ -136,7 +137,13 @@ error_authorize:
goto error_common; goto error_common;
error_enable: error_enable:
oss.str(action_error(method_name, "ENABLE/DISABLE", "IMAGE", iid, rc)); if (enable_flag == TRUE)
{
err_msg = "ENABLE";
} else {
err_msg = "DISABLE";
}
oss.str(action_error(method_name, err_msg, "IMAGE", iid, rc));
image->unlock(); image->unlock();
goto error_common; goto error_common;

2
src/vm/VirtualMachine.cc
View File

@ -1113,7 +1113,7 @@ int VirtualMachine::save_disk(int disk_id, int img_id)
num_disks = vm_template->get("DISK",disks); num_disks = vm_template->get("DISK",disks);
for(int i=0; i<num_disks; i++) for(int i=0; i<num_disks; i++, iss.clear())
{ {
disk = dynamic_cast<VectorAttribute * >(disks[i]); disk = dynamic_cast<VectorAttribute * >(disks[i]);