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

@@ -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',

nova/tests/unit/virt/libvirt/test_quobyte.py → 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):

nova/tests/unit/virt/libvirt/test_remotefs.py → 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):

nova/tests/unit/virt/libvirt/test_volume.py → 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'

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',
 ]
 
 

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()

nova/virt/libvirt/volume.py → 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__)