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-instances function

Browse Source
This commit is contained in:
Daniel Molina 2013-08-09 12:04:07 +02:00
parent ded1202c95
commit ef120e47d8
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/instance.rb
View File

@ -108,11 +108,33 @@ module Instance
end
def describe_instances(params)
user_flag = OpenNebula::Pool::INFO_ALL
vmpool = VirtualMachinePool.new(@client, user_flag)
vmpool = []
params.each { |key, value|
if key =~ /InstanceId\./
if value =~ /i\-(.+)/
vm = VirtualMachine.new(VirtualMachine.build_xml($1), @client)
rc = vm.info
if OpenNebula.is_error?(rc)
rc.ec2_code = "InvalidInstanceID.NotFound"
return rc
else
vmpool << vm
end
else
rc = OpenNebula::Error.new("InvalidInstanceID.Malformed #{value}")
rc.ec2_code = "InvalidInstanceID.Malformed"
return rc
end
end
}
rc = vmpool.info
return rc if OpenNebula::is_error?(rc)
if vmpool.empty?
user_flag = OpenNebula::Pool::INFO_ALL
vmpool = VirtualMachinePool.new(@client, user_flag)
rc = vmpool.info
return rc if OpenNebula::is_error?(rc)
end
erb_version = params['Version']
erb_user_name = params['AWSAccessKeyId']