summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Tran <jtran@attinteractive.com>2011-05-24 09:43:52 -0700
committerJohn Tran <jtran@attinteractive.com>2011-05-24 09:43:52 -0700
commita0cffc4de8ba4b15958e320308477d42287858e7 (patch)
tree05924259e9b05c776967e6f185c7fdb25d145330
parent8e7c3121fab4b5a87c2efe865f3c06b1bd267cbc (diff)
specified image_id keyword in exception arg
-rw-r--r--nova/api/ec2/cloud.py2
-rw-r--r--nova/tests/test_cloud.py2
2 files changed, 2 insertions, 2 deletions
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:
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index e37aca4d6..1e583377b 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -226,7 +226,7 @@ class CloudTestCase(test.TestCase):
'type': 'machine'}}]
def fake_show_none(meh, context, id):
- raise exception.ImageNotFound('bad_image_id')
+ raise exception.ImageNotFound(image_id='bad_image_id')
self.stubs.Set(local.LocalImageService, 'detail', fake_detail)
# list all