From ef120e47d85e1cbf2027d0b35feb46112786e688 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 9 Aug 2013 12:04:07 +0200 Subject: [PATCH] feature #2072: Improve describe-instances function --- src/cloud/ec2/lib/instance.rb | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/cloud/ec2/lib/instance.rb b/src/cloud/ec2/lib/instance.rb index 5a49f739ae..9e7444bbf2 100644 --- a/src/cloud/ec2/lib/instance.rb +++ b/src/cloud/ec2/lib/instance.rb @@ -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']