diff options
| author | jaypipes@gmail.com <> | 2010-10-05 20:38:43 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-10-05 20:38:43 +0000 |
| commit | 8e89d47958fc0e680582804ec07152ca05039854 (patch) | |
| tree | 8ba2cbd584a998505250fd226ec2abbe8f6829f1 /nova/api | |
| parent | 15cf92206627f2f56d30356ca974018d5b2244e9 (diff) | |
| parent | fbd1bc015bd5615963b9073eefb895ea04c55a3e (diff) | |
Adds stubs and tests for GlanceImageService and LocalImageService.
Adds basic plumbing for ParallaxClient and TellerClient and hooks that into the GlanceImageService.
Fixes lp654843
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/rackspace/images.py | 7 | ||||
| -rw-r--r-- | nova/api/rackspace/servers.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nova/api/rackspace/images.py b/nova/api/rackspace/images.py index 4a7dd489c..d4ab8ce3c 100644 --- a/nova/api/rackspace/images.py +++ b/nova/api/rackspace/images.py @@ -17,12 +17,17 @@ 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 + +FLAGS = flags.FLAGS + class Controller(wsgi.Controller): _serialization_metadata = { @@ -35,7 +40,7 @@ class Controller(wsgi.Controller): } def __init__(self): - self._service = nova.image.service.ImageService.load() + self._service = utils.import_object(FLAGS.image_service) self._id_translator = _id_translator.RackspaceAPIIdTranslator( "image", self._service.__class__.__name__) diff --git a/nova/api/rackspace/servers.py b/nova/api/rackspace/servers.py index 5cfb7a431..b23867bbf 100644 --- a/nova/api/rackspace/servers.py +++ b/nova/api/rackspace/servers.py @@ -42,7 +42,7 @@ def _instance_id_translator(): def _image_service(): """ Helper method for initializing the image id translator """ - service = nova.image.service.ImageService.load() + service = utils.import_object(FLAGS.image_service) return (service, _id_translator.RackspaceAPIIdTranslator( "image", service.__class__.__name__)) |