moved utils functions into nova/image/

3 files changed, 14 insertions, 8 deletions

diff --git a/nova/api/openstack/image_metadata.py b/nova/api/openstack/image_metadata.py
index f6913ffc6..c51d7acf2 100644
--- a/nova/api/openstack/image_metadata.py
+++ b/nova/api/openstack/image_metadata.py
@@ -18,6 +18,7 @@
 from webob import exc
 
 from nova import flags
+from nova import image
 from nova import quota
 from nova import utils
 from nova import wsgi
@@ -32,7 +33,7 @@ class Controller(common.OpenstackController):
     """The image metadata API controller for the Openstack API"""
 
     def __init__(self):
-        self.image_service = utils.get_default_image_service()
+        self.image_service = image.get_default_image_service()
         super(Controller, self).__init__()
 
     def _get_metadata(self, context, image_id, image=None):
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index bf9d3f49e..c61b5c6a6 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -18,6 +18,7 @@ import webob.exc
 from nova import compute
 from nova import exception
 from nova import flags
+import nova.image
 from nova import log
 from nova import utils
 from nova.api.openstack import common
@@ -51,7 +52,7 @@ class Controller(common.OpenstackController):
         """
         self._compute_service = compute_service or compute.API()
         self._image_service = image_service or \
-                utils.get_default_image_service()
+                nova.image.get_default_image_service()
 
     def index(self, req):
         """Return an index listing of images available to the request.
@@ -84,7 +85,8 @@ class Controller(common.OpenstackController):
         context = req.environ['nova.context']
 
         try:
-            (image_service, service_image_id) = utils.get_image_service(id)
+            (image_service, service_image_id) = nova.image.get_image_service(
+                id)
             image = image_service.show(context, service_image_id)
         except (exception.NotFound, exception.InvalidImageRef):
             explanation = _("Image not found.")
@@ -100,7 +102,8 @@ class Controller(common.OpenstackController):
         """
         image_id = id
         context = req.environ['nova.context']
-        (image_service, service_image_id) = utils.get_image_service(image_id)
+        (image_service, service_image_id) = nova.image.get_image_service(
+            image_id)
         image_service.delete(context, service_image_id)
         return webob.exc.HTTPNoContent()
 
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index d5dee61a5..181833a23 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -22,6 +22,7 @@ from xml.dom import minidom
 from nova import compute
 from nova import exception
 from nova import flags
+import nova.image
 from nova import log as logging
 from nova import quota
 from nova import utils
@@ -141,7 +142,7 @@ class Controller(common.OpenstackController):
 
         image_ref = self._image_ref_from_req_data(env)
         try:
-            image_service, image_id = utils.get_image_service(image_ref)
+            image_service, image_id = nova.image.get_image_service(image_ref)
             kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image(
                 req, image_id)
             images = set([str(x['id']) for x in image_service.index(context)])
@@ -559,12 +560,13 @@ class Controller(common.OpenstackController):
         associated kernel and ramdisk image IDs.
         """
         context = req.environ['nova.context']
-        image_service, service_image_id = utils.get_image_service(image_id)
-        image_meta = image_service.show(context, service_image_id)
+        image_service, service_image_id = nova.image.get_image_service(
+            image_id)
+        image = image_service.show(context, service_image_id)
         # NOTE(sirp): extracted to a separate method to aid unit-testing, the
         # new method doesn't need a request obj or an ImageService stub
         kernel_id, ramdisk_id = self._do_get_kernel_ramdisk_from_image(
-            image_meta)
+            image)
         return kernel_id, ramdisk_id
 
     @staticmethod