implemented review suggestion EAFP style, and fixed test stub fake_show needs to have image_state = available or other tests will fail

1 files changed, 9 insertions, 5 deletions

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'),