summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-01-26 16:12:35 -0500
committerDan Prince <dan.prince@rackspace.com>2011-01-26 16:12:35 -0500
commit8f794ff09225285439299f03bdaba4362e2e1ff5 (patch)
tree7d66907a4fb7195c1aa621ddb25ad882e3daf527
parent4ada8681832e17d8682dab65892b750604a9e74e (diff)
Fix issue in s3.py causing where '_fix_image_id' is not defined.
-rw-r--r--nova/image/s3.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/image/s3.py b/nova/image/s3.py
index 62d4d0e63..c60b215a0 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -65,7 +65,7 @@ class S3ImageService(service.BaseImageService):
'image_id': image_id}))
return image_id
- def _fix_image_id(images):
+ def _fix_image_id(self, images):
"""S3 has imageId but OpenStack wants id"""
for image in images:
if 'imageId' in image:
@@ -79,7 +79,7 @@ class S3ImageService(service.BaseImageService):
response = self._conn(context).make_request(
method='GET',
bucket='_images')
- return _fix_image_id(json.loads(response.read()))
+ return self._fix_image_id(json.loads(response.read()))
def show(self, context, image_id):
"""return a image object if the context has permissions"""