From a9938aebde8b8a1c1571840e53ab220ac9a17086 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 18 Jun 2015 10:02:38 -0700 Subject: [PATCH] libvirt: move volume/remotefs/quobyte modules under volume subdir As part of the refactor for the libvirt volume drivers, move the volume-specific modules under a new 'volume' subdirectory. The next step will be breaking the volume drivers out into their own specific modules. Part of blueprint consolidate-libvirt-fs-volume-drivers Change-Id: I5fc2425d2c25076ea87686b2e41be35f66ebb923 --- nova/tests/unit/virt/libvirt/test_driver.py | 8 ++--- .../unit/virt/libvirt/volume/__init__.py | 0 .../virt/libvirt/{ => volume}/test_quobyte.py | 2 +- .../libvirt/{ => volume}/test_remotefs.py | 2 +- .../virt/libvirt/{ => volume}/test_volume.py | 4 +-- nova/virt/libvirt/driver.py | 29 ++++++++++--------- nova/virt/libvirt/imagebackend.py | 5 ++-- nova/virt/libvirt/volume/__init__.py | 0 nova/virt/libvirt/{ => volume}/quobyte.py | 0 nova/virt/libvirt/{ => volume}/remotefs.py | 0 nova/virt/libvirt/{ => volume}/volume.py | 4 +-- 11 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 nova/tests/unit/virt/libvirt/volume/__init__.py rename nova/tests/unit/virt/libvirt/{ => volume}/test_quobyte.py (99%) rename nova/tests/unit/virt/libvirt/{ => volume}/test_remotefs.py (98%) rename nova/tests/unit/virt/libvirt/{ => volume}/test_volume.py (99%) create mode 100644 nova/virt/libvirt/volume/__init__.py rename nova/virt/libvirt/{ => volume}/quobyte.py (100%) rename nova/virt/libvirt/{ => volume}/remotefs.py (100%) rename nova/virt/libvirt/{ => volume}/volume.py (99%) diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index 5306a176cf9..1416d9eca20 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -93,7 +93,7 @@ from nova.virt.libvirt.storage import lvm from nova.virt.libvirt.storage import rbd_utils from nova.virt.libvirt import utils as libvirt_utils -from nova.virt.libvirt import volume as volume_drivers +from nova.virt.libvirt.volume import volume as volume_drivers libvirt_driver.libvirt = fakelibvirt host.libvirt = fakelibvirt @@ -4577,9 +4577,9 @@ def test_get_volume_driver_unknown(self): connection_info ) - @mock.patch('nova.virt.libvirt.volume.LibvirtFakeVolumeDriver.' - 'connect_volume') - @mock.patch('nova.virt.libvirt.volume.LibvirtFakeVolumeDriver.get_config') + @mock.patch.object(volume_drivers.LibvirtFakeVolumeDriver, + 'connect_volume') + @mock.patch.object(volume_drivers.LibvirtFakeVolumeDriver, 'get_config') def test_get_volume_config(self, get_config, connect_volume): drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) connection_info = {'driver_volume_type': 'fake', diff --git a/nova/tests/unit/virt/libvirt/volume/__init__.py b/nova/tests/unit/virt/libvirt/volume/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/nova/tests/unit/virt/libvirt/test_quobyte.py b/nova/tests/unit/virt/libvirt/volume/test_quobyte.py similarity index 99% rename from nova/tests/unit/virt/libvirt/test_quobyte.py rename to nova/tests/unit/virt/libvirt/volume/test_quobyte.py index 4da5b20c8f5..3085da1f59b 100644 --- a/nova/tests/unit/virt/libvirt/test_quobyte.py +++ b/nova/tests/unit/virt/libvirt/volume/test_quobyte.py @@ -23,7 +23,7 @@ from nova import exception from nova import test from nova import utils -from nova.virt.libvirt import quobyte +from nova.virt.libvirt.volume import quobyte class QuobyteTestCase(test.NoDBTestCase): diff --git a/nova/tests/unit/virt/libvirt/test_remotefs.py b/nova/tests/unit/virt/libvirt/volume/test_remotefs.py similarity index 98% rename from nova/tests/unit/virt/libvirt/test_remotefs.py rename to nova/tests/unit/virt/libvirt/volume/test_remotefs.py index adef3f5d8fa..ca236fe6e91 100644 --- a/nova/tests/unit/virt/libvirt/test_remotefs.py +++ b/nova/tests/unit/virt/libvirt/volume/test_remotefs.py @@ -18,7 +18,7 @@ from nova import test from nova import utils -from nova.virt.libvirt import remotefs +from nova.virt.libvirt.volume import remotefs class RemoteFSTestCase(test.NoDBTestCase): diff --git a/nova/tests/unit/virt/libvirt/test_volume.py b/nova/tests/unit/virt/libvirt/volume/test_volume.py similarity index 99% rename from nova/tests/unit/virt/libvirt/test_volume.py rename to nova/tests/unit/virt/libvirt/volume/test_volume.py index 5c1f8e407af..4bea0cfbc05 100644 --- a/nova/tests/unit/virt/libvirt/test_volume.py +++ b/nova/tests/unit/virt/libvirt/volume/test_volume.py @@ -28,9 +28,9 @@ from nova.tests.unit.virt.libvirt import fakelibvirt from nova import utils from nova.virt.libvirt import host -from nova.virt.libvirt import quobyte from nova.virt.libvirt import utils as libvirt_utils -from nova.virt.libvirt import volume +from nova.virt.libvirt.volume import quobyte +from nova.virt.libvirt.volume import volume CONF = cfg.CONF SECRET_UUID = '2a0a0d6c-babf-454d-b93e-9ac9957b95e0' diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 1dc1b8ede6e..7324e655039 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -272,20 +272,21 @@ 'GuestNumaConfig', ['cpuset', 'cputune', 'numaconfig', 'numatune']) libvirt_volume_drivers = [ - 'iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver', - 'iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver', - 'local=nova.virt.libvirt.volume.LibvirtVolumeDriver', - 'fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver', - 'rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver', - 'sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver', - 'nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver', - 'smbfs=nova.virt.libvirt.volume.LibvirtSMBFSVolumeDriver', - 'aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver', - 'glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver', - 'fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver', - 'scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver', - 'gpfs=nova.virt.libvirt.volume.LibvirtGPFSVolumeDriver', - 'quobyte=nova.virt.libvirt.volume.LibvirtQuobyteVolumeDriver', + 'iscsi=nova.virt.libvirt.volume.volume.LibvirtISCSIVolumeDriver', + 'iser=nova.virt.libvirt.volume.volume.LibvirtISERVolumeDriver', + 'local=nova.virt.libvirt.volume.volume.LibvirtVolumeDriver', + 'fake=nova.virt.libvirt.volume.volume.LibvirtFakeVolumeDriver', + 'rbd=nova.virt.libvirt.volume.volume.LibvirtNetVolumeDriver', + 'sheepdog=nova.virt.libvirt.volume.volume.LibvirtNetVolumeDriver', + 'nfs=nova.virt.libvirt.volume.volume.LibvirtNFSVolumeDriver', + 'smbfs=nova.virt.libvirt.volume.volume.LibvirtSMBFSVolumeDriver', + 'aoe=nova.virt.libvirt.volume.volume.LibvirtAOEVolumeDriver', + 'glusterfs=nova.virt.libvirt.volume.volume.LibvirtGlusterfsVolumeDriver', + 'fibre_channel=' + 'nova.virt.libvirt.volume.volume.LibvirtFibreChannelVolumeDriver', + 'scality=nova.virt.libvirt.volume.volume.LibvirtScalityVolumeDriver', + 'gpfs=nova.virt.libvirt.volume.volume.LibvirtGPFSVolumeDriver', + 'quobyte=nova.virt.libvirt.volume.volume.LibvirtQuobyteVolumeDriver', ] diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index 0e55fba6eb0..8708d29651d 100644 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -80,8 +80,9 @@ group='ephemeral_storage_encryption') CONF.import_opt('key_size', 'nova.compute.api', group='ephemeral_storage_encryption') -CONF.import_opt('rbd_user', 'nova.virt.libvirt.volume', group='libvirt') -CONF.import_opt('rbd_secret_uuid', 'nova.virt.libvirt.volume', group='libvirt') +CONF.import_opt('rbd_user', 'nova.virt.libvirt.volume.volume', group='libvirt') +CONF.import_opt('rbd_secret_uuid', 'nova.virt.libvirt.volume.volume', + group='libvirt') LOG = logging.getLogger(__name__) IMAGE_API = image.API() diff --git a/nova/virt/libvirt/volume/__init__.py b/nova/virt/libvirt/volume/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/nova/virt/libvirt/quobyte.py b/nova/virt/libvirt/volume/quobyte.py similarity index 100% rename from nova/virt/libvirt/quobyte.py rename to nova/virt/libvirt/volume/quobyte.py diff --git a/nova/virt/libvirt/remotefs.py b/nova/virt/libvirt/volume/remotefs.py similarity index 100% rename from nova/virt/libvirt/remotefs.py rename to nova/virt/libvirt/volume/remotefs.py diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume/volume.py similarity index 99% rename from nova/virt/libvirt/volume.py rename to nova/virt/libvirt/volume/volume.py index 243a021ab58..f982855f04a 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume/volume.py @@ -36,9 +36,9 @@ from nova import paths from nova import utils from nova.virt.libvirt import config as vconfig -from nova.virt.libvirt import quobyte -from nova.virt.libvirt import remotefs from nova.virt.libvirt import utils as libvirt_utils +from nova.virt.libvirt.volume import quobyte +from nova.virt.libvirt.volume import remotefs LOG = logging.getLogger(__name__)