From 17fceb2368d63dd937dc5e9385158c01130557a7 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Fri, 8 Jul 2011 14:19:35 -0700
Subject: peer review fix - per vish: 'This method automatically converts
 unknown formats to ami, which is the same logic used to display unknown
 images in the ec2 api.  This will allow you to properly deregister raw
 images, etc.'

---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index a4f4dae4f..ee263f614 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -1095,7 +1095,7 @@ class CloudController(object):
             except exception.NotFound:
                 raise exception.ImageNotFound(image_id=ec2_id)
         image_type = ec2_id.split('-')[0]
-        if image.get('container_format') != image_type:
+        if self._image_type(image.get('container_format')) != image_type:
             raise exception.ImageNotFound(image_id=ec2_id)
         return image
 
-- 
cgit