Merge "libvirt: move lvm/dmcrypt/rbd_utils modules under storage subdir"

nova/tests/unit/virt/libvirt/storage/test_dmcrypt.py

@@ -17,7 +17,7 @@ import os
 
 from nova import test
 from nova import utils
-from nova.virt.libvirt import dmcrypt
+from nova.virt.libvirt.storage import dmcrypt
 
 
 class LibvirtDmcryptTestCase(test.NoDBTestCase):

nova/tests/unit/virt/libvirt/storage/test_lvm.py

@@ -22,7 +22,7 @@ from oslo_config import cfg
 from nova import exception
 from nova import test
 from nova import utils
-from nova.virt.libvirt import lvm
+from nova.virt.libvirt.storage import lvm
 from nova.virt.libvirt import utils as libvirt_utils
 
 CONF = cfg.CONF

nova/tests/unit/virt/libvirt/storage/test_rbd.py

@@ -18,7 +18,7 @@ from nova import exception
 from nova import objects
 from nova import test
 from nova import utils
-from nova.virt.libvirt import rbd_utils
+from nova.virt.libvirt.storage import rbd_utils
 
 
 LOG = logging.getLogger(__name__)

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

@@ -89,8 +89,8 @@ from nova.virt.libvirt import firewall
 from nova.virt.libvirt import guest as libvirt_guest
 from nova.virt.libvirt import host
 from nova.virt.libvirt import imagebackend
-from nova.virt.libvirt import lvm
-from nova.virt.libvirt import rbd_utils
+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
 
@@ -12128,7 +12128,7 @@ class LibvirtDriverTestCase(test.NoDBTestCase):
             instance)
 
     @mock.patch('os.path.exists')
-    @mock.patch('nova.virt.libvirt.lvm.list_volumes')
+    @mock.patch.object(lvm, 'list_volumes')
     def test_lvm_disks(self, listlvs, exists):
         instance = objects.Instance(uuid='fake-uuid', id=1)
         self.flags(images_volume_group='vols', group='libvirt')

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

@@ -40,7 +40,7 @@ from nova.virt.image import model as imgmodel
 from nova.virt import images
 from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import imagebackend
-from nova.virt.libvirt import rbd_utils
+from nova.virt.libvirt.storage import rbd_utils
 
 CONF = cfg.CONF
 CONF.import_opt('fixed_key', 'nova.keymgr.conf_key_mgr', group='keymgr')

nova/virt/libvirt/driver.py

@@ -91,14 +91,14 @@ from nova.virt import hardware
 from nova.virt.image import model as imgmodel
 from nova.virt.libvirt import blockinfo
 from nova.virt.libvirt import config as vconfig
-from nova.virt.libvirt import dmcrypt
 from nova.virt.libvirt import firewall as libvirt_firewall
 from nova.virt.libvirt import guest as libvirt_guest
 from nova.virt.libvirt import host
 from nova.virt.libvirt import imagebackend
 from nova.virt.libvirt import imagecache
-from nova.virt.libvirt import lvm
-from nova.virt.libvirt import rbd_utils
+from nova.virt.libvirt.storage import dmcrypt
+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 vif as libvirt_vif
 from nova.virt import netutils

nova/virt/libvirt/imagebackend.py

@@ -39,9 +39,9 @@ from nova.virt.disk import api as disk
 from nova.virt.image import model as imgmodel
 from nova.virt import images
 from nova.virt.libvirt import config as vconfig
-from nova.virt.libvirt import dmcrypt
-from nova.virt.libvirt import lvm
-from nova.virt.libvirt import rbd_utils
+from nova.virt.libvirt.storage import dmcrypt
+from nova.virt.libvirt.storage import lvm
+from nova.virt.libvirt.storage import rbd_utils
 from nova.virt.libvirt import utils as libvirt_utils
 
 __imagebackend_opts = [