From 842bd9646ad0e9008af86da9153fdf592788b3c3 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 21 Jan 2011 14:51:24 -0800
Subject: Wrap instance at api layer to print the proper error.  Use same logic
 for volumes.

---
 nova/api/ec2/cloud.py | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index c94540793..766727b56 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -529,11 +529,18 @@ class CloudController(object):
 
     def describe_volumes(self, context, volume_id=None, **kwargs):
         if volume_id:
-            volume_id = [ec2_id_to_id(x) for x in volume_id]
-        volumes = self.volume_api.get_all(context)
-        # NOTE(vish): volume_id is an optional list of volume ids to filter by.
-        volumes = [self._format_volume(context, v) for v in volumes
-                   if volume_id is None or v['id'] in volume_id]
+            volumes = []
+            for ec2_id in volume_id:
+                internal_id = ec2_id_to_id(ec2_id)
+                try:
+                    volume = self.volume_api.get(context, internal_id)
+                    volumes.append(volume)
+                except exception.NotFound:
+                    raise exception.NotFound("Volume %s could not be found"
+                                             % ec2_id)
+        else:
+            volumes = self.volume_api.get_all(context)
+        volumes = [self._format_volume(context, v) for v in volumes]
         return {'volumeSet': volumes}
 
     def _format_volume(self, context, volume):
@@ -657,8 +664,15 @@ class CloudController(object):
         reservations = {}
         # NOTE(vish): instance_id is an optional list of ids to filter by
         if instance_id:
-            instance_id = [ec2_id_to_id(x) for x in instance_id]
-            instances = [self.compute_api.get(context, x) for x in instance_id]
+            instances = []
+            for ec2_id in instance_id:
+                internal_id = ec2_id_to_id(ec2_id)
+                try:
+                    instance = self.compute_api.get(context, internal_id)
+                    instances.append(instance)
+                except exception.NotFound:
+                    raise exception.NotFound("Instance %s could not be found"
+                                             % ec2_id)
         else:
             instances = self.compute_api.get_all(context, **kwargs)
         for instance in instances:
-- 
cgit 


From 60f992b7fa1d1abf494cc210f7f199414a0538bb Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 21 Jan 2011 16:03:51 -0800
Subject: i18n!

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

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 766727b56..60e47fb87 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -536,7 +536,7 @@ class CloudController(object):
                     volume = self.volume_api.get(context, internal_id)
                     volumes.append(volume)
                 except exception.NotFound:
-                    raise exception.NotFound("Volume %s could not be found"
+                    raise exception.NotFound(_("Volume %s not found")
                                              % ec2_id)
         else:
             volumes = self.volume_api.get_all(context)
@@ -671,7 +671,7 @@ class CloudController(object):
                     instance = self.compute_api.get(context, internal_id)
                     instances.append(instance)
                 except exception.NotFound:
-                    raise exception.NotFound("Instance %s could not be found"
+                    raise exception.NotFound(_("Instance %s not found")
                                              % ec2_id)
         else:
             instances = self.compute_api.get_all(context, **kwargs)
-- 
cgit