tests: Move libvirt-specific fixtures

These were left to last since there's a bit of cleanup necessary to move
everything across.

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

Author: stephenfin

nova/tests/fixtures/__init__.py

@@ -17,6 +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 .neutron import NeutronFixture  # noqa: F401
 from .nova import *  # noqa: F401, F403
 from .policy import OverridePolicyFixture  # noqa: F401

nova/tests/unit/virt/libvirt/fake_imagebackend.py renamed to nova/tests/fixtures/imagebackend.py

@@ -27,17 +27,17 @@
 
 
 class ImageBackendFixture(fixtures.Fixture):
+
     def __init__(self, got_files=None, imported_files=None, exists=None):
         """This fixture mocks imagebackend.Backend.backend, which is the
         only entry point to libvirt.imagebackend from libvirt.driver.
 
         :param got_files: A list of {'filename': path, 'size': size} for every
-                         file which was created.
+            file which was created.
         :param imported_files: A list of (local_filename, remote_filename) for
-                               every invocation of import_file().
+            every invocation of import_file().
         :param exists: An optional lambda which takes the disk name as an
-                       argument, and returns True if the disk exists,
-                       False otherwise.
+            argument, and returns True if the disk exists, False otherwise.
         """
         self.got_files = got_files
         self.imported_files = imported_files
@@ -49,27 +49,27 @@ def __init__(self, got_files=None, imported_files=None, exists=None):
         self._exists = exists
 
     def setUp(self):
-        super(ImageBackendFixture, self).setUp()
+        super().setUp()
 
         # Mock template functions passed to cache
         self.mock_fetch_image = mock.create_autospec(libvirt_utils.fetch_image)
         self.useFixture(fixtures.MonkeyPatch(
             'nova.virt.libvirt.utils.fetch_image', self.mock_fetch_image))
 
-        self.mock_fetch_raw_image = \
-            mock.create_autospec(libvirt_utils.fetch_raw_image)
+        self.mock_fetch_raw_image = mock.create_autospec(
+            libvirt_utils.fetch_raw_image)
         self.useFixture(fixtures.MonkeyPatch(
             'nova.virt.libvirt.utils.fetch_raw_image',
             self.mock_fetch_raw_image))
 
-        self.mock_create_ephemeral = \
-            mock.create_autospec(driver.LibvirtDriver._create_ephemeral)
+        self.mock_create_ephemeral = mock.create_autospec(
+            driver.LibvirtDriver._create_ephemeral)
         self.useFixture(fixtures.MonkeyPatch(
             'nova.virt.libvirt.driver.LibvirtDriver._create_ephemeral',
             self.mock_create_ephemeral))
 
-        self.mock_create_swap = \
-            mock.create_autospec(driver.LibvirtDriver._create_swap)
+        self.mock_create_swap = mock.create_autospec(
+            driver.LibvirtDriver._create_swap)
         self.useFixture(fixtures.MonkeyPatch(
             'nova.virt.libvirt.driver.LibvirtDriver._create_swap',
             self.mock_create_swap))
@@ -84,10 +84,11 @@ def created_disks(self):
         """disks, filtered to contain only disks which were actually created
         by calling a relevant method.
         """
-
         # A disk was created iff either cache() or import_file() was called.
-        return {name: disk for name, disk in self.disks.items()
-                if any([disk.cache.called, disk.import_file.called])}
+        return {
+            name: disk for name, disk in self.disks.items()
+            if any([disk.cache.called, disk.import_file.called])
+        }
 
     def _mock_disk(self):
         # This is the generator passed to the disks defaultdict. It returns
@@ -119,8 +120,8 @@ def _mock_disk(self):
         disk.libvirt_info.side_effect = functools.partial(
             self._fake_libvirt_info, disk)
 
-        disk.direct_snapshot.side_effect = (
-            NotImplementedError('direct_snapshot() is not implemented'))
+        disk.direct_snapshot.side_effect = NotImplementedError(
+            'direct_snapshot() is not implemented')
 
         return disk
 
@@ -196,8 +197,8 @@ def is_file_in_instance_path():
             return False
 
         setattr(image_init, 'is_shared_block_storage', is_shared_block_storage)
-        setattr(image_init, 'is_file_in_instance_path',
-                is_file_in_instance_path)
+        setattr(
+            image_init, 'is_file_in_instance_path', is_file_in_instance_path)
 
         return image_init
 

nova/tests/unit/virt/libvirt/fakelibvirt.py renamed to nova/tests/fixtures/libvirt.py

@@ -28,7 +28,7 @@
 
 from nova import conf
 from nova.objects import fields as obj_fields
-from nova.tests.unit.virt.libvirt import fake_libvirt_data
+from nova.tests.fixtures import libvirt_data as fake_libvirt_data
 from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import driver as libvirt_driver
 
@@ -2118,14 +2118,14 @@ def __init__(self):
 _EventAddHandleFunc = FakeHandler
 
 
-class FakeLibvirtFixture(fixtures.Fixture):
+class LibvirtFixture(fixtures.Fixture):
     """Performs global setup/stubbing for all libvirt tests.
     """
     def __init__(self, stub_os_vif=True):
         self.stub_os_vif = stub_os_vif
 
     def setUp(self):
-        super(FakeLibvirtFixture, self).setUp()
+        super().setUp()
 
         # Some modules load the libvirt library in a strange way
         for module in ('driver', 'host', 'guest', 'migration'):

nova/tests/unit/virt/libvirt/fake_libvirt_data.py renamed to nova/tests/fixtures/libvirt_data.py

@@ -21,9 +21,8 @@
 
 from nova import conf
 from nova.tests import fixtures as nova_fixtures
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional import integrated_helpers
-from nova.tests.unit.virt.libvirt import fake_imagebackend
-from nova.tests.unit.virt.libvirt import fakelibvirt
 
 
 CONF = conf.CONF
@@ -42,8 +41,8 @@ def setUp(self):
 
         super(ServersTestBase, self).setUp()
 
-        self.useFixture(fake_imagebackend.ImageBackendFixture())
-        self.useFixture(fakelibvirt.FakeLibvirtFixture())
+        self.useFixture(nova_fixtures.ImageBackendFixture())
+        self.useFixture(nova_fixtures.LibvirtFixture())
 
         self.useFixture(fixtures.MockPatch(
             'nova.virt.libvirt.LibvirtDriver._create_image',

nova/tests/functional/libvirt/base.py

@@ -13,8 +13,8 @@
 import fixtures
 
 from nova import conf
+from nova.tests import fixtures as nova_fixtures
 from nova.tests.functional import integrated_helpers
-from nova.tests.unit.virt.libvirt import fakelibvirt
 
 
 CONF = conf.CONF
@@ -31,7 +31,7 @@ class LibvirtProviderUsageBaseTestCase(
 
     def setUp(self):
         super(LibvirtProviderUsageBaseTestCase, self).setUp()
-        self.useFixture(fakelibvirt.FakeLibvirtFixture(stub_os_vif=False))
+        self.useFixture(nova_fixtures.LibvirtFixture(stub_os_vif=False))
         if self.STUB_INIT_HOST:
             self.useFixture(
                 fixtures.MockPatch(

nova/tests/functional/libvirt/integrated_helpers.py

@@ -27,11 +27,11 @@
 from nova import objects
 from nova import test
 from nova.tests import fixtures as nova_fixtures
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional import fixtures as func_fixtures
 from nova.tests.functional import integrated_helpers
 from nova.tests.unit import fake_network
 from nova.tests.unit import fake_notifier
-from nova.tests.unit.virt.libvirt import fakelibvirt
 from nova.virt.libvirt import config as libvirt_config
 
 CONF = conf.CONF
@@ -434,7 +434,7 @@ def setUp(self):
         fake_notifier.stub_notifier(self)
         self.addCleanup(fake_notifier.reset)
 
-        self.useFixture(fakelibvirt.FakeLibvirtFixture())
+        self.useFixture(nova_fixtures.LibvirtFixture())
 
         # Fake out all the details of volume connection
         self.useFixture(fixtures.MockPatch(

nova/tests/functional/libvirt/test_evacuate.py

@@ -23,10 +23,10 @@
 from nova import context
 from nova import objects
 from nova import test
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional import integrated_helpers
 from nova.tests.functional.libvirt import base
 from nova.tests.unit.virt.libvirt import fake_os_brick_connector
-from nova.tests.unit.virt.libvirt import fakelibvirt
 
 
 CONF = cfg.CONF
@@ -109,7 +109,7 @@ class NUMALiveMigrationPositiveBase(NUMALiveMigrationBase):
     def setUp(self):
         super(NUMALiveMigrationPositiveBase, self).setUp()
         self.useFixture(fixtures.MonkeyPatch(
-            'nova.tests.unit.virt.libvirt.fakelibvirt.Domain.migrateToURI3',
+            'nova.tests.fixtures.libvirt.Domain.migrateToURI3',
             self._migrate_stub))
         self.migrate_stub_ran = False
 

nova/tests/functional/libvirt/test_numa_live_migration.py

@@ -24,10 +24,10 @@
 from nova import context as nova_context
 from nova import objects
 from nova.tests import fixtures as nova_fixtures
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.api import client
 from nova.tests.functional.libvirt import base
 from nova.tests.unit import fake_notifier
-from nova.tests.unit.virt.libvirt import fakelibvirt
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

nova/tests/functional/libvirt/test_numa_servers.py

@@ -32,11 +32,11 @@
 from nova import objects
 from nova.objects import fields
 from nova.tests import fixtures as nova_fixtures
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.api import client
 from nova.tests.functional.libvirt import base
 from nova.tests.unit import fake_notifier
 from nova.tests.unit.virt.libvirt import fake_os_brick_connector
-from nova.tests.unit.virt.libvirt import fakelibvirt
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
@@ -126,7 +126,7 @@ def setUp(self):
             'nova.virt.libvirt.driver.connector',
             fake_os_brick_connector))
         self.useFixture(fixtures.MonkeyPatch(
-            'nova.tests.unit.virt.libvirt.fakelibvirt.Domain.migrateToURI3',
+            'nova.tests.fixtures.libvirt.Domain.migrateToURI3',
             self._migrate_stub))
 
     def _migrate_stub(self, domain, destination, params, flags):

nova/tests/functional/libvirt/test_pci_sriov_servers.py

@@ -21,8 +21,8 @@
 from nova import conf
 from nova.db import constants as db_const
 from nova import test
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.libvirt import integrated_helpers
-from nova.tests.unit.virt.libvirt import fakelibvirt
 from nova.virt.libvirt.host import SEV_KERNEL_PARAM_FILE
 
 CONF = conf.CONF

nova/tests/functional/libvirt/test_report_cpu_traits.py

@@ -19,8 +19,8 @@
 
 from nova import context
 from nova import objects
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.libvirt import base
-from nova.tests.unit.virt.libvirt import fakelibvirt
 from nova.virt.libvirt import utils
 
 

nova/tests/functional/libvirt/test_reshape.py

@@ -24,8 +24,8 @@
 import nova.conf
 from nova import context
 from nova import objects
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.libvirt import base
-from nova.tests.unit.virt.libvirt import fakelibvirt
 from nova.virt.libvirt import driver as libvirt_driver
 from nova.virt.libvirt import utils as libvirt_utils
 

nova/tests/functional/libvirt/test_vgpu.py

@@ -17,9 +17,9 @@
 from oslo_log import log as logging
 
 from nova import objects
+from nova.tests import fixtures as nova_fixtures
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.libvirt import integrated_helpers
-from nova.tests.unit.virt.libvirt import fake_imagebackend
-from nova.tests.unit.virt.libvirt import fakelibvirt
 
 
 CONF = cfg.CONF
@@ -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(fake_imagebackend.ImageBackendFixture())
+        self.useFixture(nova_fixtures.ImageBackendFixture())
         self.useFixture(fixtures.MockPatch(
             'nova.virt.libvirt.LibvirtDriver._get_local_gb_info',
             return_value={'total': 128,

nova/tests/functional/libvirt/test_vpmem.py

@@ -17,10 +17,11 @@
 
 import nova.conf
 from nova import exception
+from nova.tests import fixtures as nova_fixtures
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.notification_sample_tests \
     import notification_sample_base
 from nova.tests.unit import fake_notifier
-from nova.tests.unit.virt.libvirt import fakelibvirt
 from nova.virt.libvirt import host
 
 
@@ -32,7 +33,7 @@ class TestLibvirtErrorNotificationSample(
 
     def setUp(self):
         self.flags(compute_driver='libvirt.LibvirtDriver')
-        self.useFixture(fakelibvirt.FakeLibvirtFixture())
+        self.useFixture(nova_fixtures.LibvirtFixture())
         self.useFixture(fixtures.MockPatchObject(host.Host, 'initialize'))
         super(TestLibvirtErrorNotificationSample, self).setUp()
 

nova/tests/functional/notification_sample_tests/test_libvirt.py

@@ -20,8 +20,8 @@
 
 from nova import test
 from nova.tests import fixtures as nova_fixtures
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional import fixtures as func_fixtures
-from nova.tests.unit.virt.libvirt import fakelibvirt
 from nova.virt.libvirt import guest as libvirt_guest
 
 
@@ -46,7 +46,7 @@ def setUp(self):
         self.useFixture(fixtures.MonkeyPatch(
            'nova.virt.libvirt.guest.libvirt',
            fakelibvirt))
-        self.useFixture(fakelibvirt.FakeLibvirtFixture())
+        self.useFixture(nova_fixtures.LibvirtFixture())
 
         self.admin_api = api_fixture.admin_api
         self.api = api_fixture.api

nova/tests/functional/regressions/test_bug_1595962.py

@@ -18,9 +18,9 @@
 from nova import context
 from nova.network import constants as neutron_constants
 from nova.network import neutron
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.libvirt import base as libvirt_base
 from nova.tests.unit.virt.libvirt import fake_os_brick_connector
-from nova.tests.unit.virt.libvirt import fakelibvirt
 
 
 class TestLiveMigrationWithoutMultiplePortBindings(
@@ -73,7 +73,7 @@ def setUp(self):
         self.ctxt = context.get_admin_context()
         # TODO(sean-k-mooney): remove this when it is part of ServersTestBase
         self.useFixture(fixtures.MonkeyPatch(
-            'nova.tests.unit.virt.libvirt.fakelibvirt.Domain.migrateToURI3',
+            'nova.tests.fixtures.libvirt.Domain.migrateToURI3',
             self._migrate_stub))
 
     def _migrate_stub(self, domain, destination, params, flags):

nova/tests/functional/regressions/test_bug_1888395.py

@@ -13,8 +13,8 @@
 # under the License.
 
 from nova.tests import fixtures as nova_fixtures
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.libvirt import base
-from nova.tests.unit.virt.libvirt import fakelibvirt
 
 
 class TestVolAttachmentsAfterFailureToScheduleOrBuild(base.ServersTestBase):

nova/tests/functional/regressions/test_bug_1899649.py

@@ -16,9 +16,9 @@
 from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import test
+from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.api import client
 from nova.tests.functional.libvirt import base
-from nova.tests.unit.virt.libvirt import fakelibvirt
 from nova.virt.libvirt.host import SEV_KERNEL_PARAM_FILE
 
 

nova/tests/functional/regressions/test_bug_1928063.py

@@ -18,7 +18,7 @@
 
 from nova.objects import fields as obj_fields
 from nova import test
-import nova.tests.unit.virt.libvirt.fakelibvirt as libvirt
+from nova.tests.fixtures import libvirt
 from nova.virt.libvirt import config as vconfig
 
 

nova/tests/unit/virt/libvirt/test_fakelibvirt.py renamed to nova/tests/unit/fixtures/test_libvirt.py

@@ -18,7 +18,7 @@
 
 from nova.objects import fields as obj_fields
 from nova import test
-from nova.tests.unit.virt.libvirt import fake_libvirt_data
+from nova.tests.fixtures import libvirt_data as fake_libvirt_data
 from nova.virt import hardware
 from nova.virt.libvirt import config