Merge "tests: Remove '_FakeImageService'"

Author: Zuul

nova/tests/unit/api/openstack/compute/test_access_ips.py

@@ -17,8 +17,8 @@
 from nova.api.openstack.compute import servers as servers_v21
 from nova import exception
 from nova import test
+from nova.tests import fixtures
 from nova.tests.unit.api.openstack import fakes
-from nova.tests.unit.image import fake
 
 v4_key = "accessIPv4"
 v6_key = "accessIPv6"
@@ -38,7 +38,7 @@ def fake_rebuild(*args, **kwargs):
 
         fakes.stub_out_nw_api(self)
         self._set_up_controller()
-        fake.stub_out_image_service(self)
+        self.useFixture(fixtures.GlanceFixture(self))
         self.stub_out('nova.compute.api.API.get',
                       # This project_id matches fakes.HTTPRequest.blank.
                       fakes.fake_compute_get(project_id=fakes.FAKE_PROJECT_ID))

nova/tests/unit/api/openstack/compute/test_availability_zone.py

@@ -28,8 +28,8 @@
 from nova import exception
 from nova import objects
 from nova import test
+from nova.tests import fixtures
 from nova.tests.unit.api.openstack import fakes
-from nova.tests.unit.image import fake
 from nova.tests.unit import matchers
 from nova.tests.unit.objects import test_service
 
@@ -208,7 +208,7 @@ def create_db_entry_for_new_instance(*args, **kwargs):
             instance.uuid = FAKE_UUID
             return instance
 
-        fake.stub_out_image_service(self)
+        self.useFixture(fixtures.GlanceFixture(self))
         self.stub_out('nova.compute.api.API.create_db_entry_for_new_instance',
                       create_db_entry_for_new_instance)
 

nova/tests/unit/api/openstack/compute/test_disk_config.py

@@ -24,9 +24,9 @@
 from nova import exception
 from nova import objects
 from nova import test
+from nova.tests import fixtures
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_instance
-import nova.tests.unit.image.fake
 
 
 MANUAL_INSTANCE_UUID = fakes.FAKE_UUID
@@ -100,8 +100,7 @@ def _get_expected_msg_for_invalid_disk_config(self):
                 ' not one of [\'AUTO\', \'MANUAL\']", "code": 400}}}}')
 
     def _setup_fake_image_service(self):
-        self.image_service = nova.tests.unit.image.fake.stub_out_image_service(
-                self)
+        self.image_service = self.useFixture(fixtures.GlanceFixture(self))
         timestamp = datetime.datetime(2011, 1, 1, 1, 2, 3)
         image = {'id': '88580842-f50a-11e2-8d3a-f23c91aec05e',
                  'name': 'fakeimage7',
@@ -117,10 +116,6 @@ def _setup_fake_image_service(self):
                  'properties': {'auto_disk_config': 'Disabled'}}
         self.image_service.create(None, image)
 
-    def tearDown(self):
-        super(DiskConfigTestCaseV21, self).tearDown()
-        nova.tests.unit.image.fake.FakeImageService_reset()
-
     def assertDiskConfig(self, dict_, value):
         self.assertIn(API_DISK_CONFIG, dict_)
         self.assertEqual(dict_[API_DISK_CONFIG], value)

nova/tests/unit/api/openstack/compute/test_server_actions.py

@@ -29,10 +29,10 @@
 from nova.image import glance
 from nova import objects
 from nova import test
+from nova.tests import fixtures as nova_fixtures
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_instance
-from nova.tests.unit.image import fake
 
 
 CONF = nova.conf.CONF
@@ -69,7 +69,7 @@ def setUp(self):
         self.stub_out('nova.objects.Instance.save', lambda *a, **kw: None)
 
         fakes.stub_out_compute_api_snapshot(self)
-        fake.stub_out_image_service(self)
+        self.useFixture(nova_fixtures.GlanceFixture(self))
         self.flags(enable_instance_password=True, group='api')
         # TODO(stephenfin): Use uuidsentinel instead of this
         self._image_href = '155d900f-4e14-4e4c-a73d-069cbf4541e6'
@@ -591,7 +591,7 @@ def return_image_meta(*args, **kwargs):
 
             return image_meta
 
-        self.stub_out('nova.tests.unit.image.fake._FakeImageService.show',
+        self.stub_out('nova.tests.fixtures.GlanceFixture.show',
                       return_image_meta)
         body = {
             "rebuild": {
@@ -643,7 +643,7 @@ def return_image_meta(*args, **kwargs):
 
             return image_meta
 
-        self.stub_out('nova.tests.unit.image.fake._FakeImageService.show',
+        self.stub_out('nova.tests.fixtures.GlanceFixture.show',
                       return_image_meta)
         self.stub_out('nova.compute.api.API.get', wrap_get)
         self.stub_out('nova.objects.Instance.save', fake_save)

nova/tests/unit/api/openstack/compute/test_servers.py

@@ -70,7 +70,6 @@
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_flavor
 from nova.tests.unit import fake_instance
-from nova.tests.unit.image import fake
 from nova.tests.unit import matchers
 from nova import utils as nova_utils
 
@@ -228,7 +227,7 @@ def setUp(self):
         super(ControllerTest, self).setUp()
         fakes.stub_out_nw_api(self)
         fakes.stub_out_key_pair_funcs(self)
-        fake.stub_out_image_service(self)
+        self.useFixture(nova_fixtures.GlanceFixture(self))
         fakes.stub_out_secgroup_api(
             self, security_groups=[{'name': 'default'}])
         return_server = fakes.fake_compute_get(id=2, availability_zone='nova',
@@ -3066,7 +3065,7 @@ def test_rebuild_instance_with_metadata_value_not_string(self):
                           self.controller._action_rebuild, self.req,
                           FAKE_UUID, body=self.body)
 
-    @mock.patch.object(fake._FakeImageService, 'show',
+    @mock.patch.object(nova_fixtures.GlanceFixture, 'show',
                        return_value=dict(
                            id='76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
                            name='public image', is_public=True,
@@ -3082,7 +3081,7 @@ def test_rebuild_instance_fails_when_min_ram_too_small(self, mock_show):
             self.req.environ['nova.context'], self.image_uuid,
             include_locations=False, show_deleted=True)
 
-    @mock.patch.object(fake._FakeImageService, 'show',
+    @mock.patch.object(nova_fixtures.GlanceFixture, 'show',
                        return_value=dict(
                            id='76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
                            name='public image', is_public=True,
@@ -3098,7 +3097,7 @@ def test_rebuild_instance_fails_when_min_disk_too_small(self, mock_show):
             self.req.environ['nova.context'], self.image_uuid,
             include_locations=False, show_deleted=True)
 
-    @mock.patch.object(fake._FakeImageService, 'show',
+    @mock.patch.object(nova_fixtures.GlanceFixture, 'show',
                        return_value=dict(
                            id='76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
                            name='public image', is_public=True,
@@ -3120,7 +3119,7 @@ def test_rebuild_instance_name_all_blank(self):
                           self.controller._action_rebuild,
                           self.req, FAKE_UUID, body=self.body)
 
-    @mock.patch.object(fake._FakeImageService, 'show',
+    @mock.patch.object(nova_fixtures.GlanceFixture, 'show',
                        return_value=dict(
                            id='76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
                            name='public image', is_public=True,
@@ -3140,7 +3139,7 @@ def fake_get_image(self, context, image_href, **kwargs):
                         name='public image', is_public=True, status='active')
 
         with test.nested(
-            mock.patch.object(fake._FakeImageService, 'show',
+            mock.patch.object(nova_fixtures.GlanceFixture, 'show',
                               side_effect=fake_get_image),
             mock.patch.object(self.controller.compute_api, 'rebuild',
                               side_effect=exception.OnsetFileLimitExceeded)
@@ -4251,7 +4250,7 @@ def server_update_and_get_original(
             return (inst, inst)
 
         fakes.stub_out_key_pair_funcs(self)
-        fake.stub_out_image_service(self)
+        self.useFixture(nova_fixtures.GlanceFixture(self))
         self.stub_out('nova.db.api.instance_create', instance_create)
         self.stub_out('nova.db.api.instance_system_metadata_update',
                       lambda *a, **kw: None)
@@ -4384,7 +4383,7 @@ def test_create_server_image_too_large(self):
                 "Flavor's disk is too small for requested image."):
             self.controller.create(self.req, body=self.body)
 
-    @mock.patch.object(fake._FakeImageService, 'show',
+    @mock.patch.object(nova_fixtures.GlanceFixture, 'show',
                        return_value=dict(
                            id='76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
                            status='active',

nova/tests/unit/api/openstack/compute/test_urlmap.py

@@ -16,18 +16,14 @@
 from oslo_serialization import jsonutils
 
 from nova import test
+from nova.tests import fixtures
 from nova.tests.unit.api.openstack import fakes
-import nova.tests.unit.image.fake
 
 
 class UrlmapTest(test.NoDBTestCase):
     def setUp(self):
         super(UrlmapTest, self).setUp()
-        nova.tests.unit.image.fake.stub_out_image_service(self)
-
-    def tearDown(self):
-        super(UrlmapTest, self).tearDown()
-        nova.tests.unit.image.fake.FakeImageService_reset()
+        self.useFixture(fixtures.GlanceFixture(self))
 
     def test_path_version_v2(self):
         # Test URL path specifying v2 returns v2 content.

nova/tests/unit/compute/test_api.py

@@ -61,7 +61,6 @@
 from nova.tests.unit import fake_instance
 from nova.tests.unit import fake_request_spec
 from nova.tests.unit import fake_volume
-from nova.tests.unit.image import fake as fake_image
 from nova.tests.unit import matchers
 from nova.tests.unit.objects import test_flavor
 from nova.tests.unit.objects import test_migration
@@ -3263,7 +3262,7 @@ def fake_get_absolute_limits(context):
         self.useFixture(fixtures.MockPatchObject(
             self.compute_api.compute_rpcapi, 'unquiesce_instance',
             side_effect=fake_unquiesce_instance))
-        fake_image.stub_out_image_service(self)
+        self.useFixture(nova_fixtures.GlanceFixture(self))
 
         with test.nested(
                 mock.patch.object(compute_api.API, '_record_action_start'),
@@ -3636,8 +3635,8 @@ def _setup_fake_image_with_disabled_disk_config(self):
             'properties': {"auto_disk_config": "Disabled"},
         }
 
-        fake_image.stub_out_image_service(self)
-        self.stub_out('nova.tests.unit.image.fake._FakeImageService.show',
+        self.useFixture(nova_fixtures.GlanceFixture(self))
+        self.stub_out('nova.tests.fixtures.GlanceFixture.show',
                       lambda obj, context, image_id, **kwargs: self.fake_image)
         return self.fake_image['id']
 
@@ -3649,8 +3648,8 @@ def _setup_fake_image_with_invalid_arch(self):
             'properties': {"hw_architecture": "arm64"},
         }
 
-        fake_image.stub_out_image_service(self)
-        self.stub_out('nova.tests.unit.image.fake._FakeImageService.show',
+        self.useFixture(nova_fixtures.GlanceFixture(self))
+        self.stub_out('nova.tests.fixtures.GlanceFixture.show',
                       lambda obj, context, image_id, **kwargs: self.fake_image)
         return self.fake_image['id']