diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-01-13 13:48:01 -0600 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-01-13 13:48:01 -0600 |
| commit | 2c7ffd2dab260c2bfc308ccd0c8d52e57a015413 (patch) | |
| tree | 7c1b460132d3d0e7c01ce7ee3da7d3da4c12149c /nova/api | |
| parent | 204e5a2d9a481abba64ce31c12510d7e1bf288a6 (diff) | |
| download | nova-2c7ffd2dab260c2bfc308ccd0c8d52e57a015413.tar.gz nova-2c7ffd2dab260c2bfc308ccd0c8d52e57a015413.tar.xz nova-2c7ffd2dab260c2bfc308ccd0c8d52e57a015413.zip | |
Fixing Image ID workaround and typo
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/images.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py index 4415db75f..9d56bc508 100644 --- a/nova/api/openstack/images.py +++ b/nova/api/openstack/images.py @@ -99,9 +99,11 @@ def _filter_keys(item, keys): def _convert_image_id_to_hash(image): - image_id = abs(hash(image['imageId'])) - image['imageId'] = image_id - image['id'] = image_id + if 'imageId' in image: + # Convert EC2-style ID (i-blah) to Rackspace-style (int) + image_id = abs(hash(image['imageId'])) + image['imageId'] = image_id + image['id'] = image_id class Controller(wsgi.Controller): @@ -155,7 +157,7 @@ class Controller(wsgi.Controller): instance_id = env["image"]["serverId"] name = env["image"]["name"] - image_meta = compute.ComputeAPI().snapshot( + image_meta = compute.API().snapshot( context, instance_id, name) return dict(image=image_meta) |