From 655eb8fbd21376e694f8134e42f10ddbc1aafb0e Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Wed, 6 Apr 2011 18:22:03 -0700
Subject: ec2 api run_instances checks for image status must be 'available'. 
 Overhauled test_run_instances for working set of test assertions

---
 nova/api/ec2/cloud.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 58effd134..0ea0e3603 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -814,10 +814,18 @@ class CloudController(object):
         if kwargs.get('ramdisk_id'):
             ramdisk = self._get_image(context, kwargs['ramdisk_id'])
             kwargs['ramdisk_id'] = ramdisk['id']
+        image = self._get_image(context, kwargs['image_id'])
+        if  not image:
+            raise exception.NotFound(_('Image %s not found') %
+                                     kwargs['image_id'])
+        if not 'properties' in image or \
+            (not 'image_state' in image['properties']) or \
+            (image['properties']['image_state'] is not 'available'):
+            raise exception.ApiError(_('Image must be available'))
         instances = self.compute_api.create(context,
             instance_type=instance_types.get_by_type(
                 kwargs.get('instance_type', None)),
-            image_id=self._get_image(context, kwargs['image_id'])['id'],
+            image_id = image['id'],
             min_count=int(kwargs.get('min_count', max_count)),
             max_count=max_count,
             kernel_id=kwargs.get('kernel_id'),
-- 
cgit 


From 10db492376a8bb8409e3fb3c33707865ac0f3ee7 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Mon, 2 May 2011 14:25:21 -0700
Subject: implemented review suggestion EAFP style, and fixed test stub
 fake_show needs to have image_state = available or other tests will fail

---
 nova/api/ec2/cloud.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 0ea0e3603..5dc608139 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -815,17 +815,21 @@ class CloudController(object):
             ramdisk = self._get_image(context, kwargs['ramdisk_id'])
             kwargs['ramdisk_id'] = ramdisk['id']
         image = self._get_image(context, kwargs['image_id'])
-        if  not image:
+        if not image:
             raise exception.NotFound(_('Image %s not found') %
                                      kwargs['image_id'])
-        if not 'properties' in image or \
-            (not 'image_state' in image['properties']) or \
-            (image['properties']['image_state'] is not 'available'):
+        try:
+            available = (image['properties']['image_state'] == 'available')
+        except KeyError:
+            available = False
+
+        if not available:
             raise exception.ApiError(_('Image must be available'))
+
         instances = self.compute_api.create(context,
             instance_type=instance_types.get_by_type(
                 kwargs.get('instance_type', None)),
-            image_id = image['id'],
+            image_id=image['id'],
             min_count=int(kwargs.get('min_count', max_count)),
             max_count=max_count,
             kernel_id=kwargs.get('kernel_id'),
-- 
cgit 


From 0a3da155228228d3f0eeac1efdea1e29eef2f3a0 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Thu, 12 May 2011 12:04:39 -0700
Subject: changed NotFound exception to ImageNotFound

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

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 8a54d23f2..ad8c3fe90 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -823,8 +823,7 @@ class CloudController(object):
             kwargs['ramdisk_id'] = ramdisk['id']
         image = self._get_image(context, kwargs['image_id'])
         if not image:
-            raise exception.NotFound(_('Image %s not found') %
-                                     kwargs['image_id'])
+            raise exception.ImageNotFound(kwargs['image_id'])
         try:
             available = (image['properties']['image_state'] == 'available')
         except KeyError:
-- 
cgit 


From a0cffc4de8ba4b15958e320308477d42287858e7 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Tue, 24 May 2011 09:43:52 -0700
Subject: specified image_id keyword in exception arg

---
 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 59e00781e..80c61d62b 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -848,7 +848,7 @@ class CloudController(object):
             kwargs['ramdisk_id'] = ramdisk['id']
         image = self._get_image(context, kwargs['image_id'])
         if not image:
-            raise exception.ImageNotFound(kwargs['image_id'])
+            raise exception.ImageNotFound(image_id=kwargs['image_id'])
         try:
             available = (image['properties']['image_state'] == 'available')
         except KeyError:
-- 
cgit