diff options
| author | Brian Waldon <bcwaldon@gmail.com> | 2012-06-25 14:06:08 -0700 |
|---|---|---|
| committer | Brian Waldon <bcwaldon@gmail.com> | 2012-06-27 14:31:35 -0700 |
| commit | 3aaa0b103447d56f8d3b259c693cd9a3a8dcbe36 (patch) | |
| tree | 00a15f76716fd9e43ce7c24dfc8b45e38a1b4866 /nova/api | |
| parent | 7e658bd45db6c14b4cd7e3a976caf769873d4ca1 (diff) | |
| download | nova-3aaa0b103447d56f8d3b259c693cd9a3a8dcbe36.tar.gz nova-3aaa0b103447d56f8d3b259c693cd9a3a8dcbe36.tar.xz nova-3aaa0b103447d56f8d3b259c693cd9a3a8dcbe36.zip | |
Cleanup of image service code
* Remove image_service flag
* Move nova.image.fake to nova.tests.image.fake
* Move nova.image.get_default_image_service to
nova.image.glance.get_default_image_service
* Move nova.image.get_image_service to
nova.image.glance.get_remote_image_service
* Related to bp integrate-python-glanceclient
Change-Id: Iea6db7898328a9060fb88586e042efbc0a4351fc
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/image_metadata.py | 4 | ||||
| -rw-r--r-- | nova/api/openstack/compute/images.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py index 145e0395e..516b25d88 100644 --- a/nova/api/openstack/compute/image_metadata.py +++ b/nova/api/openstack/compute/image_metadata.py @@ -21,7 +21,7 @@ from nova.api.openstack import common from nova.api.openstack import wsgi from nova import exception from nova import flags -from nova import image +from nova.image import glance FLAGS = flags.FLAGS @@ -31,7 +31,7 @@ class Controller(object): """The image metadata API controller for the OpenStack API""" def __init__(self): - self.image_service = image.get_default_image_service() + self.image_service = glance.get_default_image_service() def _get_image(self, context, image_id): try: diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py index 629ba67d5..9879c7d25 100644 --- a/nova/api/openstack/compute/images.py +++ b/nova/api/openstack/compute/images.py @@ -21,7 +21,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception from nova import flags -import nova.image +import nova.image.glance from nova import log as logging import nova.utils @@ -96,12 +96,12 @@ class Controller(wsgi.Controller): def __init__(self, image_service=None, **kwargs): """Initialize new `ImageController`. - :param image_service: `nova.image.glance:GlancemageService` + :param image_service: `nova.image.glance:GlanceImageService` """ super(Controller, self).__init__(**kwargs) self._image_service = (image_service or - nova.image.get_default_image_service()) + nova.image.glance.get_default_image_service()) def _get_filters(self, req): """ |