[dan.prince@dovetail nova-fix_image_id_s3]$ bzr diff -r623 === modified file 'nova/image/s3.py' --- nova/image/s3.py 2011-01-25 21:06:05 +0000 +++ nova/image/s3.py 2011-01-26 21:11:22 +0000 @@ -65,7 +65,7 @@ '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 @@ 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"""
[dan.prince@ dovetail nova-fix_ image_id_ s3]$ bzr diff -r623
' image_id' : image_id}))
=== modified file 'nova/image/s3.py'
--- nova/image/s3.py 2011-01-25 21:06:05 +0000
+++ nova/image/s3.py 2011-01-26 21:11:22 +0000
@@ -65,7 +65,7 @@
return image_id
- def _fix_image_ id(images) : context) .make_request(
method= 'GET',
bucket= '_images' ) id(json. loads(response. read()) ) image_id( json.loads( response. read()) )
+ 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 @@
response = self._conn(
- return _fix_image_
+ return self._fix_
def show(self, context, image_id):
"""return a image object if the context has permissions"""