From 6a8d2f5e23297aed4b5913e9a6a6bc3fdbb41a88 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 26 Jul 2010 15:34:29 +0200 Subject: [PATCH] saveas support for old disk version --- src/cli/onevm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/cli/onevm b/src/cli/onevm index 39ca4bc5d8..9f89fdbc96 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -695,27 +695,27 @@ when "saveas" get_one_client) result = vm.info - if !is_successful?(result) + if !is_successful?(result) puts result.message exit -1 end - - image_id = vm["TEMPLATE/DISK[DISK_ID=\"#{disk_id}\"]/IMAGE_ID"] - - # Get the image type - image = OpenNebula::Image.new( - OpenNebula::Image.build_xml(image_id), - get_one_client) - - result = image.info - if !is_successful?(result) - puts result.message - exit -1 - end - + if ops[:type] image_type = ops[:type] else + image_id = vm["TEMPLATE/DISK[DISK_ID=\"#{disk_id}\"]/IMAGE_ID"] + + # Get the image type + image = OpenNebula::Image.new( + OpenNebula::Image.build_xml(image_id), + get_one_client) + + result = image.info + if !is_successful?(result) + puts result.message + exit -1 + end + image_type = image.type_str end @@ -725,12 +725,12 @@ when "saveas" image = OpenNebula::Image.new( - OpenNebula::Image.build_xml, + OpenNebula::Image.build_xml, get_one_client) result = image.allocate(template) - if !is_successful?(result) + if !is_successful?(result) puts result.message exit -1 end