more bugs in image handling

share/hooks/image.rb

@@ -35,6 +35,7 @@ if !(vm_id=ARGV[0])
     exit -1
 end
 
+
 client = Client.new()
 
 vm = VirtualMachine.new(
@@ -53,18 +54,19 @@ vm.each('TEMPLATE/DISK') do |disk|
     
     if image_id and source_path
         image=Image.new(
-                Image.build_xml(image_id), 
+                Image.build_xml(image_id),
                 client)
                 
         result = image.info
-        exit -1 if !is_successful?(result) 
-        
+        exit -1 if OpenNebula.is_error?(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) 
+        
+        exit -1 if OpenNebula.is_error?(result)
     
         image.enable
     end

src/cli/onevm

@@ -349,7 +349,7 @@ Commands:
         
 * save (Set the specified vm's disk to be saved, overwriting the original image 
             when the vm shutdowns)
-    onevm saveas <vm_id> <disk_id>
+    onevm save <vm_id> <disk_id>
         
 * delete (Deletes a VM from the pool and DB)
     onevm delete <vm_id>
@@ -751,7 +751,7 @@ when "save"
     
     image_id = vm["TEMPLATE/DISK[DISK_ID=\"#{disk_id}\"]/IMAGE_ID"]
     
-    result = vm.save_as(disk_id.to_i, image_id)
+    result = vm.save_as(disk_id.to_i, image_id.to_i)
     
 when "show"
     check_parameters("get_info", 1)

src/oca/ruby/OpenNebula/Image.rb

@@ -101,6 +101,10 @@ module OpenNebula
         def copy(path, source)
             @immanager.copy(path, source)
         end
+        
+        def move(path, source)
+            @immanager.move(path, source)
+        end
 
         def mk_datablock(size, fstype, source)
             rc = @immanager.dd(size, source)