From 3c12f15607ee2aea91832f5490cb811726c90ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 23 Jul 2010 11:40:44 +0200 Subject: [PATCH 1/4] bug #288: Fixes states mapping for oneimage. --- src/oca/ruby/OpenNebula/Image.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/oca/ruby/OpenNebula/Image.rb b/src/oca/ruby/OpenNebula/Image.rb index 3d64c49131..a699b406c9 100644 --- a/src/oca/ruby/OpenNebula/Image.rb +++ b/src/oca/ruby/OpenNebula/Image.rb @@ -16,11 +16,10 @@ module OpenNebula :delete => "image.delete" } - IMAGE_STATES=%w{INIT LOCKED READY USED DISABLED} + IMAGE_STATES=%w{INIT READY USED DISABLED} SHORT_IMAGE_STATES={ "INIT" => "init", - "LOCKED" => "lock", "READY" => "rdy", "USED" => "used", "DISABLED" => "disa" From 62bf916c7b0d411360c159f515096466ea8c0767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 23 Jul 2010 11:47:51 +0200 Subject: [PATCH 2/4] bug #290: Fixed dd option, and more generic binaries search. --- src/oca/ruby/OpenNebula/Image.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/oca/ruby/OpenNebula/Image.rb b/src/oca/ruby/OpenNebula/Image.rb index a699b406c9..b3c9f53917 100644 --- a/src/oca/ruby/OpenNebula/Image.rb +++ b/src/oca/ruby/OpenNebula/Image.rb @@ -180,8 +180,8 @@ module OpenNebula # Constants and Class Methods # --------------------------------------------------------------------- FS_UTILS = { - :dd => "/bin/dd", - :mkfs => "/bin/mkfs" + :dd => "env dd", + :mkfs => "env mkfs" } def copy(path, source) @@ -221,7 +221,7 @@ module OpenNebula command = "" command << FS_UTILS[:dd] command << " if=/dev/zero of=#{source} ibs=1 count=1" - command << " obs=1048576 oseek=#{size}" + command << " obs=1048576 seek=#{size}" local_command=LocalCommand.run(command) From 933f4a6114996505dc890b26e9c66402bbbaf145 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 23 Jul 2010 16:17:22 +0200 Subject: [PATCH 3/4] fixed bugs in image handling --- share/hooks/image.rb | 57 +++++++++++++--------------- src/cli/onevm | 6 +-- src/oca/ruby/OpenNebula/Image.rb | 1 + src/oca/ruby/OpenNebula/ImagePool.rb | 2 +- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/share/hooks/image.rb b/share/hooks/image.rb index 70a1788114..48420b470a 100755 --- a/share/hooks/image.rb +++ b/share/hooks/image.rb @@ -28,8 +28,6 @@ end $: << RUBY_LIB_LOCATION -require 'fileutils' - require 'OpenNebula' include OpenNebula @@ -44,33 +42,30 @@ vm = VirtualMachine.new( client) vm.info -if vm['TEMPLATE/DISK'] - vm.each('TEMPLATE/DISK') do |disk| - - disk_id = disk["DISK_ID"] - source_path = VMDIR+"/#{vm_id}/disk.#{disk_id}" - - image_id = nil - if disk["SAVE_AS"] - image_id = disk["SAVE_AS"] - end - - if image_id and source_path - image=Image.new( - Image.build_xml(image_id), - client) - - result = image.info - exit -1 if !is_successful?(result) - - # Disable the Image for a safe overwriting - image.disable - - # Save the image file - result = image.move(source_path, image['SOURCE']) - exit -1 if !is_successful?(result) - - image.enable - end +vm.each('TEMPLATE/DISK') do |disk| + disk_id = disk["DISK_ID"] + source_path = VMDIR+"/#{vm_id}/disk.#{disk_id}" + + image_id = nil + if disk["SAVE_AS"] + image_id = disk["SAVE_AS"] end -end \ No newline at end of file + + if image_id and source_path + image=Image.new( + Image.build_xml(image_id), + client) + + result = image.info + exit -1 if !is_successful?(result) + + # Disable the Image for a safe overwriting + image.disable + + # Save the image file + result = image.move(source_path, image['SOURCE']) + exit -1 if !is_successful?(result) + + image.enable + end +end diff --git a/src/cli/onevm b/src/cli/onevm index cd1fdb6a42..e5a3d18905 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -717,7 +717,7 @@ when "saveas" # Build the template and allocate the new Image template = "NAME=#{image_name}\n" - template << "TYPE=#{image_type}\n" if type + template << "TYPE=#{image_type}\n" if image_type image = OpenNebula::Image.new( @@ -731,7 +731,7 @@ when "saveas" exit -1 end - result = vm.save_disk(disk_id.to_i, image.id) + result = vm.save_as(disk_id.to_i, image.id) when "save" check_parameters("save", 2) @@ -751,7 +751,7 @@ when "save" image_id = vm["TEMPLATE/DISK[DISK_ID=\"#{disk_id}\"]/IMAGE_ID"] - result = vm.save_disk(disk_id.to_i, image_id) + result = vm.save_as(disk_id.to_i, image_id) when "show" check_parameters("get_info", 1) diff --git a/src/oca/ruby/OpenNebula/Image.rb b/src/oca/ruby/OpenNebula/Image.rb index 3d64c49131..7fd13f284d 100644 --- a/src/oca/ruby/OpenNebula/Image.rb +++ b/src/oca/ruby/OpenNebula/Image.rb @@ -192,6 +192,7 @@ module OpenNebula begin FileUtils.copy(path, source) + FileUtils.chmod(0660, source) rescue Exception => e return OpenNebula::Error.new(e.message) end diff --git a/src/oca/ruby/OpenNebula/ImagePool.rb b/src/oca/ruby/OpenNebula/ImagePool.rb index 91e86b9d15..baa9127a62 100644 --- a/src/oca/ruby/OpenNebula/ImagePool.rb +++ b/src/oca/ruby/OpenNebula/ImagePool.rb @@ -16,7 +16,7 @@ module OpenNebula # +client+ a Client object that represents a XML-RPC connection # +user_id+ is to refer to a Pool with Images from that user - def initialize(client, user_id=0) + def initialize(client, user_id=-1) super('IMAGE_POOL','IMAGE',client) @user_id = user_id From f98e5bbf7cdf43121647ed4a968fd5a416d96aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 23 Jul 2010 16:06:25 +0200 Subject: [PATCH 4/4] bug #293: Enable/disable transitions fixed. --- include/Image.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/Image.h b/include/Image.h index 6c87507d9c..1fba0dafe5 100644 --- a/include/Image.h +++ b/include/Image.h @@ -159,11 +159,14 @@ public: { int rc = 0; - if ((to_enable == true) && (state == DISABLED)) + if ( to_enable == true ) { - state = READY; + if(state == DISABLED) + { + state = READY; + } } - else if ((to_enable == false) && (state == READY)) + else if (state != USED) // to_enable == false { state = DISABLED; }