Fixing nova.tests.api.openstack.fakes.stub_out_image_service. It now stubs

out the get_image_service and get_default_image_service functions.
Also some pep8 whitespace fixes.

5 files changed, 14 insertions, 18 deletions

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/019_rename_image_ids.py b/nova/db/sqlalchemy/migrate_repo/versions/019_rename_image_ids.py
index 6838f1ea6..73a5e8477 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/019_rename_image_ids.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/019_rename_image_ids.py
@@ -15,10 +15,11 @@
 #    under the License.
 
 from sqlalchemy import Column, Integer, MetaData, String, Table
-#from nova import log as logging
+
 
 meta = MetaData()
 
+
 def upgrade(migrate_engine):
     # Upgrade operations go here. Don't create your own engine;
     # bind migrate_engine to your metadata
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index bf51239e6..01b42d00c 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -38,6 +38,7 @@ from nova.api.openstack import auth
 from nova.api.openstack import versions
 from nova.api.openstack import limits
 from nova.auth.manager import User, Project
+import nova.image.fake
 from nova.image import glance
 from nova.image import local
 from nova.image import service
@@ -104,10 +105,12 @@ def stub_out_key_pair_funcs(stubs, have_key_pair=True):
 
 
 def stub_out_image_service(stubs):
-    def fake_image_show(meh, context, id):
-        return dict(kernelId=1, ramdiskId=1)
-
-    stubs.Set(local.LocalImageService, 'show', fake_image_show)
+    def fake_get_image_service(image_href):
+        image_id = int(str(image_href).split('/')[-1])
+        return (nova.image.fake.FakeImageService(), image_id)
+    stubs.Set(nova.image, 'get_image_service', fake_get_image_service)
+    stubs.Set(nova.image, 'get_default_image_service',
+        lambda: nova.image.fake.FakeImageService())
 
 
 def stub_out_auth(stubs):
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 1ce0e8e84..9f3b53cdf 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -475,13 +475,6 @@ class ServersTest(test.TestCase):
         def image_id_from_hash(*args, **kwargs):
             return 2
 
-        def fake_get_image_service(image_href):
-            image_id = int(str(image_href).split('/')[-1])
-            return (nova.image.fake.FakeImageService(), image_id)
-
-        self.stubs.Set(nova.image, 'get_default_image_service',
-            lambda: nova.image.fake.FakeImageService())
-        self.stubs.Set(nova.image, 'get_image_service', fake_get_image_service)
         self.stubs.Set(nova.db.api, 'project_get_network', project_get_network)
         self.stubs.Set(nova.db.api, 'instance_create', instance_create)
         self.stubs.Set(nova.rpc, 'cast', fake_method)
@@ -1684,10 +1677,9 @@ class TestServerInstanceCreation(test.TestCase):
         fakes.FakeAuthManager.auth_data = {}
         fakes.FakeAuthDatabase.data = {}
         fakes.stub_out_auth(self.stubs)
+        fakes.stub_out_image_service(self.stubs)
         fakes.stub_out_key_pair_funcs(self.stubs)
         self.allow_admin = FLAGS.allow_admin_api
-        self.stubs.Set(nova.image, 'get_default_image_service',
-            lambda: nova.image.fake.FakeImageService())
 
     def tearDown(self):
         self.stubs.UnsetAll()
diff --git a/nova/tests/glance/stubs.py b/nova/tests/glance/stubs.py
index fdd9ad4da..1e0b90d82 100644
--- a/nova/tests/glance/stubs.py
+++ b/nova/tests/glance/stubs.py
@@ -25,7 +25,7 @@ def stubout_glance_client(stubs):
         return (FakeGlance('foo'), image_id)
     stubs.Set(nova.image, 'get_glance_client', fake_get_glance_client)
 
-    
+
 class FakeGlance(object):
     IMAGE_MACHINE = 1
     IMAGE_KERNEL = 2
diff --git a/nova/virt/vmwareapi/vmware_images.py b/nova/virt/vmwareapi/vmware_images.py
index 11f4fe06a..48edc5384 100644
--- a/nova/virt/vmwareapi/vmware_images.py
+++ b/nova/virt/vmwareapi/vmware_images.py
@@ -116,7 +116,7 @@ def upload_image(image, instance, **kwargs):
 def _get_glance_image(image, instance, **kwargs):

     """Download image from the glance image server."""

     LOG.debug(_("Downloading image %s from glance image server") % image)

-    glance_client, image_id = nova.image.get_glance_client(image)    

+    (glance_client, image_id) = nova.image.get_glance_client(image)

     metadata, read_iter = glance_client.get_image(image_id)

     read_file_handle = read_write_util.GlanceFileRead(read_iter)

     file_size = int(metadata['size'])

@@ -152,7 +152,7 @@ def _put_glance_image(image, instance, **kwargs):
                                 kwargs.get("cookies"),

                                 kwargs.get("file_path"))

     file_size = read_file_handle.get_size()

-    glance_client, image_id = nova.image.get_glance_client(image)    

+    (glance_client, image_id) = nova.image.get_glance_client(image)

     # The properties and other fields that we need to set for the image.

     image_metadata = {"is_public": True,

                       "disk_format": "vmdk",

@@ -187,7 +187,7 @@ def get_vmdk_size_and_properties(image, instance):
 

     LOG.debug(_("Getting image size for the image %s") % image)

     if FLAGS.image_service == "nova.image.glance.GlanceImageService":

-        glance_client, image_id = nova.image.get_glance_client(image)    

+        (glance_client, image_id) = nova.image.get_glance_client(image)

         meta_data = glance_client.get_image_meta(image_id)

         size, properties = meta_data["size"], meta_data["properties"]

     elif FLAGS.image_service == "nova.image.s3.S3ImageService":