shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-27 10:50:10 +03:00
Code Releases Wiki Activity

feature #2072: Improve describe-images function

Browse Source
This commit is contained in:
Daniel Molina 2013-08-09 11:58:27 +02:00
parent e3594fc11b
commit 2930580067
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/cloud/ec2/lib/EC2QueryServer.rb
View File

@ -148,11 +148,33 @@ class EC2QueryServer < CloudServer
end
def describe_images(params)
user_flag = OpenNebula::Pool::INFO_ALL
impool = ImageEC2Pool.new(@client, user_flag)
impool = []
params.each { |key, value|
if key =~ /ImageId\./
if value =~ /ami\-(.+)/
image = ImageEC2.new(Image.build_xml($1), @client)
rc = image.info
if OpenNebula.is_error?(rc)
rc.ec2_code = "InvalidAMIID.NotFound"
return rc
else
impool << image
end
else
rc = OpenNebula::Error.new("InvalidAMIID #{value}")
rc.ec2_code = "InvalidAMIID"
return rc
end
end
}
rc = impool.info
return rc if OpenNebula::is_error?(rc)
if impool.empty?
user_flag = OpenNebula::Pool::INFO_ALL
impool = ImageEC2Pool.new(@client, user_flag)
rc = impool.info
return rc if OpenNebula::is_error?(rc)
end
erb_version = params['Version']