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

2 files changed, 9 insertions, 8 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 05f4caa29..557dbb930 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -39,7 +39,7 @@ from nova import crypto
 from nova.db import base
 from nova import exception
 from nova import flags
-import nova.image
+from nova.image import glance
 from nova import log as logging
 from nova import network
 from nova import notifications
@@ -121,7 +121,7 @@ class API(base.Base):
     def __init__(self, image_service=None, network_api=None, volume_api=None,
                  security_group_api=None, **kwargs):
         self.image_service = (image_service or
-                              nova.image.get_default_image_service())
+                              glance.get_default_image_service())
 
         self.network_api = network_api or network.API()
         self.volume_api = volume_api or volume.API()
@@ -374,8 +374,8 @@ class API(base.Base):
         self._check_injected_file_quota(context, injected_files)
         self._check_requested_networks(context, requested_networks)
 
-        (image_service, image_id) = nova.image.get_image_service(context,
-                                                                 image_href)
+        (image_service, image_id) = glance.get_remote_image_service(context,
+                                                                    image_href)
         image = image_service.show(context, image_id)
 
         if instance_type['memory_mb'] < int(image.get('min_ram') or 0):
@@ -1219,7 +1219,7 @@ class API(base.Base):
 
     def _get_image(self, context, image_href):
         """Throws an ImageNotFound exception if image_href does not exist."""
-        (image_service, image_id) = nova.image.get_image_service(context,
+        (image_service, image_id) = glance.get_remote_image_service(context,
                                                                  image_href)
         return image_service.show(context, image_id)
 
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index a9816817b..deca04177 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -57,7 +57,7 @@ from nova.compute import vm_states
 import nova.context
 from nova import exception
 from nova import flags
-import nova.image
+from nova.image import glance
 from nova import log as logging
 from nova import manager
 from nova import network
@@ -205,7 +205,8 @@ def wrap_instance_fault(function):
 
 
 def _get_image_meta(context, image_ref):
-    image_service, image_id = nova.image.get_image_service(context, image_ref)
+    image_service, image_id = glance.get_remote_image_service(context,
+                                                              image_ref)
     return image_service.show(context, image_id)
 
 
@@ -1056,7 +1057,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                 marker = batch[-1]['id']
             return images
 
-        image_service = nova.image.get_default_image_service()
+        image_service = glance.get_default_image_service()
         filters = {'property-image_type': 'backup',
                    'property-backup_type': backup_type,
                    'property-instance_uuid': instance_uuid}