From c3639847011566f39a7bd08e29bab4a72847a333 Mon Sep 17 00:00:00 2001
From: Michael Still <mikal@stillhq.com>
Date: Tue, 20 Nov 2012 15:09:32 +1100
Subject: Handle instances not being found in EC2 API responses.

Resolves bug 1080406 where InstanceNotFound was raised with None
as the instance id.

Change-Id: I805a9c8893f51ab22426e606ce260a04113f26e5
---
 nova/api/ec2/ec2utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py
index d5beb017f..1c2ceea6f 100644
--- a/nova/api/ec2/ec2utils.py
+++ b/nova/api/ec2/ec2utils.py
@@ -127,7 +127,9 @@ def id_to_ec2_id(instance_id, template='i-%08x'):
 
 def id_to_ec2_inst_id(instance_id):
     """Get or create an ec2 instance ID (i-[base 16 number]) from uuid."""
-    if uuidutils.is_uuid_like(instance_id):
+    if instance_id is None:
+        return None
+    elif uuidutils.is_uuid_like(instance_id):
         ctxt = context.get_admin_context()
         int_id = get_int_id_from_instance_uuid(ctxt, instance_id)
         return id_to_ec2_id(int_id)
-- 
cgit