Merge lp:~gundlach/nova/image_ids into lp:~hudson-openstack/nova/trunk

[Michael Gundlach]

Remove redis dependency from RS Images API.

[Jay Pipes (jaypipes)]

w00t.

review: Approve

=== modified file 'nova/api/rackspace/backup_schedules.py'
--- nova/api/rackspace/backup_schedules.py	2010-09-29 14:17:10 +0000
+++ nova/api/rackspace/backup_schedules.py	2010-10-08 16:23:40 +0000
@@ -19,7 +19,6 @@
 from webob import exc
 
 from nova import wsgi
-from nova.api.rackspace import _id_translator
 from nova.api.rackspace import faults
 import nova.image.service
 

=== modified file 'nova/api/rackspace/images.py'
--- nova/api/rackspace/images.py	2010-10-01 20:06:14 +0000
+++ nova/api/rackspace/images.py	2010-10-08 16:23:40 +0000
@@ -20,7 +20,6 @@
 from nova import flags
 from nova import utils
 from nova import wsgi
-from nova.api.rackspace import _id_translator
 import nova.api.rackspace
 import nova.image.service
 from nova.api.rackspace import faults
@@ -41,8 +40,6 @@
 
     def __init__(self):
         self._service = utils.import_object(FLAGS.image_service)
-        self._id_translator = _id_translator.RackspaceAPIIdTranslator(
-                "image", self._service.__class__.__name__)
 
     def index(self, req):
         """Return all public images in brief."""
@@ -53,16 +50,11 @@
         """Return all public images in detail."""
         data = self._service.index()
         data = nova.api.rackspace.limited(data, req)
-        for img in data:
-            img['id'] = self._id_translator.to_rs_id(img['id'])
         return dict(images=data)
 
     def show(self, req, id):
         """Return data about the given image id."""
-        opaque_id = self._id_translator.from_rs_id(id)
-        img = self._service.show(opaque_id)
-        img['id'] = id
-        return dict(image=img)
+        return dict(image=self._service.show(id))
 
     def delete(self, req, id):
         # Only public images are supported for now.

=== modified file 'nova/image/service.py'
--- nova/image/service.py	2010-10-05 17:29:27 +0000
+++ nova/image/service.py	2010-10-08 16:23:40 +0000
@@ -225,7 +225,9 @@
 
 class LocalImageService(BaseImageService):
 
-    """Image service storing images to local disk."""
+    """Image service storing images to local disk.
+    
+    It assumes that image_ids are integers."""
 
     def __init__(self):
         self._path = "/tmp/nova/images"
@@ -234,12 +236,12 @@
         except OSError: # exists
             pass
 
-    def _path_to(self, image_id=''):
-        return os.path.join(self._path, image_id)
+    def _path_to(self, image_id):
+        return os.path.join(self._path, str(image_id))
 
     def _ids(self):
         """The list of all image ids."""
-        return os.listdir(self._path)
+        return [int(i) for i in os.listdir(self._path)]
 
     def index(self):
         return [ self.show(id) for id in self._ids() ]
@@ -254,7 +256,7 @@
         """
         Store the image data and return the new image id.
         """
-        id = ''.join(random.choice(string.letters) for _ in range(20))
+        id = random.randint(0, 2**32-1)
         data['id'] = id
         self.update(id, data)
         return id
@@ -279,5 +281,5 @@
         """
         Clears out all images in local directory
         """
-        for f in os.listdir(self._path):
-            os.unlink(self._path_to(f))
+        for id in self._ids():
+            os.unlink(self._path_to(id))

=== modified file 'nova/tests/api/rackspace/fakes.py'
--- nova/tests/api/rackspace/fakes.py	2010-10-05 21:08:47 +0000
+++ nova/tests/api/rackspace/fakes.py	2010-10-08 16:23:40 +0000
@@ -28,7 +28,6 @@
 from nova import flags
 from nova import exception as exc
 import nova.api.rackspace.auth
-import nova.api.rackspace._id_translator
 from nova.image import service
 from nova.wsgi import Router