From db87fd5a8145d045c4767a8d02cde5a0750113f8 Mon Sep 17 00:00:00 2001
From: Michael Gundlach <michael.gundlach@rackspace.com>
Date: Fri, 8 Oct 2010 12:21:26 -0400
Subject: Remove redis dependency from Images controller.

LocalImageService now works with integer ids, so there's no need for the translator.

Once Glance exists we'll have to revisit this.
---
 nova/api/rackspace/backup_schedules.py |  1 -
 nova/api/rackspace/images.py           | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/rackspace/backup_schedules.py b/nova/api/rackspace/backup_schedules.py
index cb83023bc..9c0d41fa0 100644
--- a/nova/api/rackspace/backup_schedules.py
+++ b/nova/api/rackspace/backup_schedules.py
@@ -19,7 +19,6 @@ import time
 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
 
diff --git a/nova/api/rackspace/images.py b/nova/api/rackspace/images.py
index d4ab8ce3c..82dcd2049 100644
--- a/nova/api/rackspace/images.py
+++ b/nova/api/rackspace/images.py
@@ -20,7 +20,6 @@ from webob import exc
 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 @@ class Controller(wsgi.Controller):
 
     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 @@ class Controller(wsgi.Controller):
         """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.
-- 
cgit