diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-28 02:38:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-28 02:38:04 +0000 |
| commit | 4f6142fc7b8ea65852217c19f98fd953f4d6c414 (patch) | |
| tree | 7dfa298fb377af4938ec6c85613c81562a6188f5 /nova/api | |
| parent | 1acd9506797814a46f5b6b61ecb0a5358e39a39d (diff) | |
| parent | 0ca1c1943e6a07e7a107f38f56227768022de3dc (diff) | |
| download | nova-4f6142fc7b8ea65852217c19f98fd953f4d6c414.tar.gz nova-4f6142fc7b8ea65852217c19f98fd953f4d6c414.tar.xz nova-4f6142fc7b8ea65852217c19f98fd953f4d6c414.zip | |
Merge "Remove image service show_by_name method"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 68f3b5b3d..75f28d510 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1245,9 +1245,11 @@ class CloudController(object): internal_id = ec2utils.ec2_id_to_id(ec2_id) image = self.image_service.show(context, internal_id) except (exception.InvalidEc2Id, exception.ImageNotFound): + filters = {'name': ec2_id} + images = self.image_service.detail(context, filters=filters) try: - return self.image_service.show_by_name(context, ec2_id) - except exception.NotFound: + return images[0] + except IndexError: raise exception.ImageNotFound(image_id=ec2_id) image_type = ec2_id.split('-')[0] if ec2utils.image_type(image.get('container_format')) != image_type: |