From 8a0f49d8a46c29fb4e4a4bce09ce8427af4d1fa8 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Fri, 12 Dec 2014 17:40:25 +0100
Subject: [PATCH] bug #3396: econe-register should accept both ami-ID or ID
 options as an arg

(cherry picked from commit 7e8693d6d74214cbffefc8ab5883b1390fbb4729)
---
 src/cloud/ec2/lib/EC2QueryServer.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb
index 0538fdfb57..e8b001ad4e 100644
--- a/src/cloud/ec2/lib/EC2QueryServer.rb
+++ b/src/cloud/ec2/lib/EC2QueryServer.rb
@@ -132,8 +132,12 @@ class EC2QueryServer < CloudServer
     def register_image(params)
         # Get the Image ID
         image_id = params['ImageLocation']
-        image = ImageEC2.new(Image.build_xml(image_id.to_i), @client)
 
+        if image_id =~ /ami\-(.+)/
+            image_id = $1
+        end
+        
+        image = ImageEC2.new(Image.build_xml(image_id.to_i), @client)
         rc = image.info
         if OpenNebula.is_error?(rc)
             return rc