diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-05-13 16:45:42 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-05-13 16:45:42 +0000 |
| commit | be83d7317ee55ae0ef436f09f25beef2eccee5a6 (patch) | |
| tree | 87d4f53c8bd7c5c4056b131b3fc039ee0740f1d6 /nova/api | |
| parent | 7dc76508d38370f3cf68029fae2ffb7749a580b2 (diff) | |
| parent | 0805521c79f934ba54f839be64a2c43ed177612d (diff) | |
| download | nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.tar.gz nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.tar.xz nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.zip | |
Merged trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 | ||||
| -rw-r--r-- | nova/api/ec2/ec2utils.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 092b80fa2..be5dd38a0 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -906,7 +906,7 @@ class CloudController(object): try: internal_id = ec2utils.ec2_id_to_id(ec2_id) return self.image_service.show(context, internal_id) - except ValueError: + except (exception.InvalidEc2Id, exception.ImageNotFound): try: return self.image_service.show_by_name(context, ec2_id) except exception.NotFound: diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 1ac48163c..163aa4ed2 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -21,7 +21,10 @@ from nova import exception def ec2_id_to_id(ec2_id): """Convert an ec2 ID (i-[base 16 number]) to an instance id (int)""" - return int(ec2_id.split('-')[-1], 16) + try: + return int(ec2_id.split('-')[-1], 16) + except ValueError: + raise exception.InvalidEc2Id(ec2_id=ec2_id) def id_to_ec2_id(instance_id, template='i-%08x'): |