From 27139d33ec027bae4b247c1651bfe635a32f5ebf Mon Sep 17 00:00:00 2001
From: Devin Carlen <devin.carlen@gmail.com>
Date: Sun, 13 Feb 2011 11:55:50 -0800
Subject: Added missing doc string and made a few style tweaks

---
 nova/api/ec2/cloud.py |  1 +
 nova/image/s3.py      | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index cc41ed4ae..47cd8bf37 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -840,6 +840,7 @@ class CloudController(object):
         return True
 
     def _format_image(self, context, image):
+        """Convert from format defined by BaseImageService to S3 format."""
         i = {}
         i['imageId'] = image.get('id')
         i['kernelId'] = image.get('kernel_id')
diff --git a/nova/image/s3.py b/nova/image/s3.py
index ee6b7f0d0..71304cdd6 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -36,6 +36,22 @@ from nova.image import service
 FLAGS = flags.FLAGS
 
 
+def map_s3_to_base(image):
+    """Convert from S3 format to format defined by BaseImageService."""
+    i = {}
+    i['id'] = image.get('imageId')
+    i['name'] = image.get('imageId')
+    i['kernel_id'] = image.get('kernelId')
+    i['ramdisk_id'] = image.get('ramdiskId')
+    i['location'] = image.get('imageLocation')
+    i['owner_id'] = image.get('imageOwnerId')
+    i['status'] = image.get('imageState')
+    i['type'] = image.get('type')
+    i['is_public'] = image.get('isPublic')
+    i['architecture'] = image.get('architecture')
+    return i
+
+
 class S3ImageService(service.BaseImageService):
 
     def modify(self, context, image_id, operation):
@@ -65,28 +81,13 @@ class S3ImageService(service.BaseImageService):
                                  'image_id': image_id}))
         return image_id
 
-    def _format_image(self, image):
-        """Convert from S3 format to format defined by BaseImageService."""
-        i = {}
-        i['id'] = image.get('imageId')
-        i['name'] = image.get('imageId')
-        i['kernel_id'] = image.get('kernelId')
-        i['ramdisk_id'] = image.get('ramdiskId')
-        i['location'] = image.get('imageLocation')
-        i['owner_id'] = image.get('imageOwnerId')
-        i['status'] = image.get('imageState')
-        i['type'] = image.get('type')
-        i['is_public'] = image.get('isPublic')
-        i['architecture'] = image.get('architecture')
-        return i
-
     def index(self, context):
         """Return a list of all images that a user can see."""
         response = self._conn(context).make_request(
             method='GET',
             bucket='_images')
         images = json.loads(response.read())
-        return [self._format_image(i) for i in images]
+        return [map_s3_to_base(i) for i in images]
 
     def show(self, context, image_id):
         """return a image object if the context has permissions"""
-- 
cgit