From 875fedd5e98a1e4dc9981bf2cc879344bd70a023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Tue, 3 Aug 2010 19:47:21 +0200 Subject: [PATCH] bug #295: CLI and OCA changes to accomodate Image persistency --- src/cli/oneimage | 37 ++++++++++++++++++++++++- src/image/Image.cc | 2 +- src/oca/ruby/OpenNebula/Image.rb | 34 ++++++++++++++++++----- src/rm/RequestManagerImagePersistent.cc | 6 ++-- src/rm/RequestManagerImagePublish.cc | 4 +-- 5 files changed, 69 insertions(+), 14 deletions(-) diff --git a/src/cli/oneimage b/src/cli/oneimage index dfa43d4b26..878f3e4a3d 100755 --- a/src/cli/oneimage +++ b/src/cli/oneimage @@ -78,6 +78,13 @@ ShowTableImage={ :proc => lambda {|d,e| if d["PUBLIC"].to_i == 1 then "Yes" else "No" end} }, + :persistent => { + :name => "PERSISTENT", + :desc => "Whether the Image is persistent or not", + :size => 3, + :proc => lambda {|d,e| + if d["PERSISTENT"].to_i == 1 then "Yes" else "No" end} + }, :state => { :name => "STAT", :desc => "State of the Image", @@ -94,7 +101,7 @@ ShowTableImage={ }, :default => [:id, :user, :name, :type, :regtime, - :public, :state, :runningvms] + :public, :persistent, :state, :runningvms] } @@ -217,6 +224,12 @@ Commands: * unpublish (Unpublish an Image) oneimage unpublish +* persistent (Makes an Image persistent) + oneimage persistent + +* nonpersistent (Makes an Image non persistent) + oneimage nonpersistent + * list (Shows Images in the pool) oneimage list @@ -386,6 +399,28 @@ when "unpublish" puts "Image unpublished" if ops[:verbose] end +when "persistent" + check_parameters("publish", 1) + image_id=get_image_id(ARGV[0]) + + image=OpenNebula::Image.new_with_id(image_id, get_one_client) + + result=image.persistent + if is_successful?(result) + puts "Image made persistent" if ops[:verbose] + end + +when "nonpersistent" + check_parameters("nonpersistent", 1) + image_id=get_image_id(ARGV[0]) + + image=OpenNebula::Image.new_with_id(image_id, get_one_client) + + result=image.nonpersistent + if is_successful?(result) + puts "Image made nonpersistent" if ops[:verbose] + end + when "list" ops.merge!(get_user_flags) if !ops[:xml] diff --git a/src/image/Image.cc b/src/image/Image.cc index a2e4bd88a3..7119f3a691 100644 --- a/src/image/Image.cc +++ b/src/image/Image.cc @@ -66,7 +66,7 @@ Image::~Image() const char * Image::table = "image_pool"; -const char * Image::db_names = "(oid, uid, name, type, public, regtime, " +const char * Image::db_names = "(oid, uid, name, type, public, persistent, regtime, " "source, state, running_vms)"; const char * Image::db_bootstrap = "CREATE TABLE IF NOT EXISTS image_pool (" diff --git a/src/oca/ruby/OpenNebula/Image.rb b/src/oca/ruby/OpenNebula/Image.rb index 65ab9cda64..38762a5f46 100644 --- a/src/oca/ruby/OpenNebula/Image.rb +++ b/src/oca/ruby/OpenNebula/Image.rb @@ -7,13 +7,14 @@ module OpenNebula # Constants and Class Methods # --------------------------------------------------------------------- IMAGE_METHODS = { - :info => "image.info", - :allocate => "image.allocate", - :update => "image.update", - :rmattr => "image.rmattr", - :enable => "image.enable", - :publish => "image.publish", - :delete => "image.delete" + :info => "image.info", + :allocate => "image.allocate", + :update => "image.update", + :rmattr => "image.rmattr", + :enable => "image.enable", + :publish => "image.publish", + :persistent => "image.persistent", + :delete => "image.delete" } IMAGE_STATES=%w{INIT READY USED DISABLED} @@ -108,6 +109,16 @@ module OpenNebula def unpublish set_publish(false) end + + # Makes the Image persistent + def persistent + set_persistent(true) + end + + # Makes the Image non persistent + def unpublish + set_persistent(false) + end # Deletes the Image def delete() @@ -168,6 +179,15 @@ module OpenNebula return rc end + + def set_persistent(persistence) + return Error.new('ID not defined') if !@pe_id + + rc = @client.call(IMAGE_METHODS[:persistent], @pe_id, persistence) + rc = nil if !OpenNebula.is_error?(rc) + + return rc + end def do_rm_attr(name) return Error.new('ID not defined') if !@pe_id diff --git a/src/rm/RequestManagerImagePersistent.cc b/src/rm/RequestManagerImagePersistent.cc index 072e36530d..871b432305 100644 --- a/src/rm/RequestManagerImagePersistent.cc +++ b/src/rm/RequestManagerImagePersistent.cc @@ -103,7 +103,7 @@ void RequestManager::ImagePersistent::execute( response = image->persistent(persistent_flag); - if (response) + if (!response) { goto error_persistent; } @@ -136,8 +136,8 @@ error_authorize: goto error_common; error_persistent: - oss << action_error(method_name, "MANAGE", "IMAGE", iid, -1) - << ". Is the image public? An Image cannot be public and persistent."; + oss << action_error(method_name, "MANAGE", "IMAGE", iid, NULL) + << " Is the image public? An Image cannot be public and persistent."; goto error_common; error_common: diff --git a/src/rm/RequestManagerImagePublish.cc b/src/rm/RequestManagerImagePublish.cc index d61ac910d5..820b1961c3 100644 --- a/src/rm/RequestManagerImagePublish.cc +++ b/src/rm/RequestManagerImagePublish.cc @@ -136,8 +136,8 @@ error_authorize: goto error_common; error_publish: - oss << action_error(method_name, "MANAGE", "IMAGE", iid, -1) - << ". Is the image persistent? An Image cannot be public and persistent."; + oss << action_error(method_name, "MANAGE", "IMAGE", iid, NULL) + << " Is the image persistent? An Image cannot be public and persistent."; goto error_common; error_common: