tests: Rename 'ImageBackendFixture' to 'LibvirtImageBackendFixture'

This fixture is specific to the libvirt driver. Rename it to make that
obvious.

Change-Id: Ic961058c55b17d92885857f239aa437e7b19d274
Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

nova/tests/fixtures/__init__.py

@@ -17,8 +17,8 @@
 from .conf import ConfFixture  # noqa: F401, F403
 from .cyborg import CyborgFixture  # noqa: F401
 from .glance import GlanceFixture  # noqa: F401
-from .imagebackend import ImageBackendFixture  # noqa: F401
 from .libvirt import LibvirtFixture  # noqa: F401
+from .libvirt_imagebackend import LibvirtImageBackendFixture  # noqa: F401
 from .neutron import NeutronFixture  # noqa: F401
 from .nova import *  # noqa: F401, F403
 from .os_brick import OSBrickFixture  # noqa: F401

nova/tests/fixtures/imagebackend.py renamed to nova/tests/fixtures/libvirt_imagebackend.py

@@ -26,7 +26,7 @@
 from nova.virt.libvirt import utils as libvirt_utils
 
 
-class ImageBackendFixture(fixtures.Fixture):
+class LibvirtImageBackendFixture(fixtures.Fixture):
 
     def __init__(self, got_files=None, imported_files=None, exists=None):
         """This fixture mocks imagebackend.Backend.backend, which is the

nova/tests/functional/libvirt/base.py

@@ -41,7 +41,7 @@ def setUp(self):
 
         super(ServersTestBase, self).setUp()
 
-        self.useFixture(nova_fixtures.ImageBackendFixture())
+        self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
         self.useFixture(nova_fixtures.LibvirtFixture())
 
         self.useFixture(fixtures.MockPatch(

nova/tests/functional/libvirt/test_vpmem.py

@@ -74,7 +74,7 @@ def setUp(self):
         self.useFixture(fixtures.MockPatch(
             'nova.privsep.libvirt.get_pmem_namespaces',
             return_value=self.fake_pmem_namespaces))
-        self.useFixture(nova_fixtures.ImageBackendFixture())
+        self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
         self.useFixture(fixtures.MockPatch(
             'nova.virt.libvirt.LibvirtDriver._get_local_gb_info',
             return_value={'total': 128,

nova/tests/unit/virt/libvirt/test_driver.py

@@ -13490,13 +13490,13 @@ def test_create_images_and_backing_ephemeral_gets_created(
     def test_create_images_and_backing_disk_info_none(self):
         instance = objects.Instance(**self.test_instance)
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
-        fake_backend = self.useFixture(nova_fixtures.ImageBackendFixture())
+        backend = self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
 
         drvr._create_images_and_backing(self.context, instance,
                                         "/fake/instance/dir", None)
 
         # Assert that we did nothing
-        self.assertEqual({}, fake_backend.created_disks)
+        self.assertEqual({}, backend.created_disks)
 
     @mock.patch.object(libvirt_driver.LibvirtDriver,
                        '_fetch_instance_kernel_ramdisk')
@@ -14439,7 +14439,7 @@ def fake_getCPUMap():
         instance.config_drive = ''
         image_meta = objects.ImageMeta.from_dict(self.test_image_meta)
 
-        self.useFixture(nova_fixtures.ImageBackendFixture())
+        self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
 
         with test.nested(
@@ -14554,8 +14554,8 @@ def fake_create_guest_with_network(
             # to execute it.
             post_xml_callback()
 
-        fake_backend = self.useFixture(
-            nova_fixtures.ImageBackendFixture(exists=lambda _: False))
+        backend = self.useFixture(
+            nova_fixtures.LibvirtImageBackendFixture(exists=lambda _: False))
 
         mock_get_info.return_value = instance_info
         mock_create_guest_with_network.side_effect = \
@@ -14564,7 +14564,7 @@ def fake_create_guest_with_network(
         drvr.spawn(self.context, instance, image_meta, [], None, {})
 
         # We should have imported 'disk.config'
-        config_disk = fake_backend.disks['disk.config']
+        config_disk = backend.disks['disk.config']
         config_disk.import_file.assert_called_once_with(instance, mock.ANY,
                                                         'disk.config')
 
@@ -14575,7 +14575,7 @@ def test_spawn_without_image_meta(self):
 
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
         image_meta = objects.ImageMeta.from_dict(self.test_image_meta)
-        fake_backend = self.useFixture(nova_fixtures.ImageBackendFixture())
+        backend = self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
 
         self.stub_out('nova.virt.libvirt.driver.LibvirtDriver._get_guest_xml',
                       lambda *a, **kw: None)
@@ -14590,7 +14590,7 @@ def test_spawn_without_image_meta(self):
 
         # We should have created a root disk and an ephemeral disk
         self.assertEqual(['disk', 'disk.local'],
-                         sorted(fake_backend.created_disks.keys()))
+                         sorted(backend.created_disks.keys()))
 
     def _test_spawn_disks(self, image_ref, block_device_info):
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
@@ -14603,7 +14603,7 @@ def _test_spawn_disks(self, image_ref, block_device_info):
         instance.root_device_name = '/dev/vda'
         instance.uuid = uuids.instance_uuid
 
-        backend = self.useFixture(nova_fixtures.ImageBackendFixture())
+        backend = self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
 
         with test.nested(
                 mock.patch.object(drvr, '_get_guest_xml'),
@@ -14780,7 +14780,7 @@ def fake_node_device_lookup_by_name(address):
 
         image_meta = objects.ImageMeta.from_dict(self.test_image_meta)
 
-        self.useFixture(nova_fixtures.ImageBackendFixture())
+        self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
 
         with mock.patch.object(drvr, '_get_connection',
                                return_value=mock_connection):
@@ -14802,7 +14802,7 @@ def test_spawn_with_vtpm(
         instance.
         """
         self.flags(swtpm_enabled=True, group='libvirt')
-        self.useFixture(nova_fixtures.ImageBackendFixture())
+        self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
 
         mock_get_info.return_value = hardware.InstanceInfo(
             state=power_state.RUNNING)
@@ -14847,7 +14847,7 @@ def _test_create_image_plain(self, os_type='', filename='', mkfs=False):
                                             image_meta)
 
         self.useFixture(
-            nova_fixtures.ImageBackendFixture(got_files=gotFiles))
+            nova_fixtures.LibvirtImageBackendFixture(got_files=gotFiles))
 
         drvr._create_image(self.context, instance, disk_info['mapping'])
         drvr._get_guest_xml(self.context, instance, None,
@@ -14904,8 +14904,8 @@ def test_create_image_initrd(self):
 
         driver = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
 
-        fake_backend = self.useFixture(
-            nova_fixtures.ImageBackendFixture(got_files=gotFiles))
+        backend = self.useFixture(
+            nova_fixtures.LibvirtImageBackendFixture(got_files=gotFiles))
 
         with test.nested(
             mock.patch.object(driver, '_get_guest_xml'),
@@ -14921,12 +14921,12 @@ def test_create_image_initrd(self):
 
         # Assert that kernel and ramdisk were fetched with fetch_raw_image
         # and no size
-        for name, disk in fake_backend.disks.items():
+        for name, disk in backend.disks.items():
             cache = disk.cache
             if name in ('kernel', 'ramdisk'):
                 cache.assert_called_once_with(
                     context=self.context, filename=mock.ANY, image_id=mock.ANY,
-                    fetch_func=fake_backend.mock_fetch_raw_image)
+                    fetch_func=backend.mock_fetch_raw_image)
 
         wantFiles = [
             {'filename': kernel_fname,
@@ -14959,7 +14959,7 @@ def test_create_configdrive(self, mock_make_drive,
         instance.config_drive = 'True'
 
         backend = self.useFixture(
-            nova_fixtures.ImageBackendFixture(exists=lambda path: False))
+            nova_fixtures.LibvirtImageBackendFixture(exists=lambda x: False))
 
         mock_build_device_metadata.return_value = None
         injection_info = get_injection_info(
@@ -15012,7 +15012,7 @@ def test_create_image_with_swap(self, expected,
                                             instance, image_meta,
                                             block_device_info=bdi)
 
-        backend = self.useFixture(nova_fixtures.ImageBackendFixture())
+        backend = self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
         drvr._create_image(self.context, instance, disk_info['mapping'],
                            block_device_info=bdi, **create_image_kwargs)
 
@@ -15093,7 +15093,7 @@ def test_create_image_with_ephemerals(self, mock_get_ext):
                                             instance, image_meta,
                                             block_device_info=bdi)
         mock_get_ext.return_value = mock.sentinel.file_ext
-        backend = self.useFixture(nova_fixtures.ImageBackendFixture())
+        backend = self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
 
         drvr._create_image(self.context, instance, disk_info['mapping'],
                            block_device_info=bdi)
@@ -15118,12 +15118,12 @@ def test_create_image_resize_snap_backend(self, mock_cache):
                                             instance,
                                             image_meta)
 
-        fake_backend = self.useFixture(nova_fixtures.ImageBackendFixture())
+        backend = self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
 
         drvr._create_image(self.context, instance, disk_info['mapping'])
 
         # Assert we called create_snap on the root disk
-        fake_backend.disks['disk'].create_snap.assert_called_once_with(
+        backend.disks['disk'].create_snap.assert_called_once_with(
             libvirt_utils.RESIZE_SNAPSHOT_NAME)
 
     @mock.patch('nova.privsep.fs.mkfs')
@@ -15967,7 +15967,7 @@ def test_hard_reboot(self, mock_get_mdev, mock_destroy, mock_get_disk_info,
         mock_get_disk_info.return_value = \
             fake_disk_info_byname(instance).values()
 
-        backend = self.useFixture(nova_fixtures.ImageBackendFixture())
+        backend = self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
 
         accel_info = [{'k1': 'v1', 'k2': 'v2'}]
         with mock.patch('os.path.exists', return_value=True):
@@ -21718,7 +21718,7 @@ def _test_finish_migration(self, mock_instance_metadata,
         disk_info = list(fake_disk_info_byname(instance, type='raw').values())
         disk_info_text = jsonutils.dumps(disk_info)
 
-        backend = self.useFixture(nova_fixtures.ImageBackendFixture())
+        backend = self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
         mock_create_guest_with_network.return_value = \
             libvirt_guest.Guest('fake_dom')
 
@@ -23909,7 +23909,7 @@ def _test_rescue(
         mock_get_mdev.return_value = {uuids.mdev1: uuids.inst1}
 
         backend = self.useFixture(
-            nova_fixtures.ImageBackendFixture(exists=exists))
+            nova_fixtures.LibvirtImageBackendFixture(exists=exists))
 
         if not image_meta_dict:
             image_meta_dict = {'id': uuids.image_id, 'name': 'fake'}

nova/tests/unit/virt/test_virt_drivers.py

@@ -83,7 +83,7 @@ def _setup_fakelibvirt(self):
             self.saved_libvirt = None
 
         self.useFixture(nova_fixtures.OSBrickFixture())
-        self.useFixture(nova_fixtures.ImageBackendFixture())
+        self.useFixture(nova_fixtures.LibvirtImageBackendFixture())
         self.useFixture(nova_fixtures.LibvirtFixture())
 
         self.useFixture(fixtures.MonkeyPatch(