From bfc28c3ef204c18819d2d4fb0cfbbf323517807f Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 18 Jun 2015 08:57:17 -0700 Subject: [PATCH] libvirt: move lvm/dmcrypt/rbd_utils modules under storage subdir The monolithic nova.virt.libvirt.volume module is going to be split out for a refactor of the file system type volume drivers and those will go into a nova/virt/libvirt/volume/ directory. As a prelude to moving the volume module, we are moving the related lvm dmcrypt, and rbd_utils modules into the new storage subdirectory. These are not moved into the volume directory since they are also used for image management so put them in the more generic storage subdirectory. Part of blueprint consolidate-libvirt-fs-volume-drivers Change-Id: Ib5471e99ad9ab63bddfa75c96b4ee7590eb3c867 --- nova/tests/unit/virt/libvirt/storage/__init__.py | 0 nova/tests/unit/virt/libvirt/{ => storage}/test_dmcrypt.py | 2 +- nova/tests/unit/virt/libvirt/{ => storage}/test_lvm.py | 2 +- nova/tests/unit/virt/libvirt/{ => storage}/test_rbd.py | 2 +- nova/tests/unit/virt/libvirt/test_driver.py | 6 +++--- nova/tests/unit/virt/libvirt/test_imagebackend.py | 2 +- nova/virt/libvirt/driver.py | 6 +++--- nova/virt/libvirt/imagebackend.py | 6 +++--- nova/virt/libvirt/storage/__init__.py | 0 nova/virt/libvirt/{ => storage}/dmcrypt.py | 0 nova/virt/libvirt/{ => storage}/lvm.py | 0 nova/virt/libvirt/{ => storage}/rbd_utils.py | 0 12 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 nova/tests/unit/virt/libvirt/storage/__init__.py rename nova/tests/unit/virt/libvirt/{ => storage}/test_dmcrypt.py (98%) rename nova/tests/unit/virt/libvirt/{ => storage}/test_lvm.py (99%) rename nova/tests/unit/virt/libvirt/{ => storage}/test_rbd.py (99%) create mode 100644 nova/virt/libvirt/storage/__init__.py rename nova/virt/libvirt/{ => storage}/dmcrypt.py (100%) rename nova/virt/libvirt/{ => storage}/lvm.py (100%) rename nova/virt/libvirt/{ => storage}/rbd_utils.py (100%) diff --git a/nova/tests/unit/virt/libvirt/storage/__init__.py b/nova/tests/unit/virt/libvirt/storage/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/nova/tests/unit/virt/libvirt/test_dmcrypt.py b/nova/tests/unit/virt/libvirt/storage/test_dmcrypt.py similarity index 98% rename from nova/tests/unit/virt/libvirt/test_dmcrypt.py rename to nova/tests/unit/virt/libvirt/storage/test_dmcrypt.py index 02efbe10b59c..6df04bdff503 100644 --- a/nova/tests/unit/virt/libvirt/test_dmcrypt.py +++ b/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): diff --git a/nova/tests/unit/virt/libvirt/test_lvm.py b/nova/tests/unit/virt/libvirt/storage/test_lvm.py similarity index 99% rename from nova/tests/unit/virt/libvirt/test_lvm.py rename to nova/tests/unit/virt/libvirt/storage/test_lvm.py index 99977df73b38..83220e261c47 100644 --- a/nova/tests/unit/virt/libvirt/test_lvm.py +++ b/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 diff --git a/nova/tests/unit/virt/libvirt/test_rbd.py b/nova/tests/unit/virt/libvirt/storage/test_rbd.py similarity index 99% rename from nova/tests/unit/virt/libvirt/test_rbd.py rename to nova/tests/unit/virt/libvirt/storage/test_rbd.py index 0d343146cd87..02e945dfba10 100644 --- a/nova/tests/unit/virt/libvirt/test_rbd.py +++ b/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__) diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index bdceebc105e9..d8b38d0d7fdd 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/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') diff --git a/nova/tests/unit/virt/libvirt/test_imagebackend.py b/nova/tests/unit/virt/libvirt/test_imagebackend.py index ee6f491ba869..92c4a538b66c 100644 --- a/nova/tests/unit/virt/libvirt/test_imagebackend.py +++ b/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') diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index cfef68d3f810..4bbf351f966d 100644 --- a/nova/virt/libvirt/driver.py +++ b/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 diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index a35bff2dee7b..0e55fba6eb0d 100644 --- a/nova/virt/libvirt/imagebackend.py +++ b/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 = [ diff --git a/nova/virt/libvirt/storage/__init__.py b/nova/virt/libvirt/storage/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/nova/virt/libvirt/dmcrypt.py b/nova/virt/libvirt/storage/dmcrypt.py similarity index 100% rename from nova/virt/libvirt/dmcrypt.py rename to nova/virt/libvirt/storage/dmcrypt.py diff --git a/nova/virt/libvirt/lvm.py b/nova/virt/libvirt/storage/lvm.py similarity index 100% rename from nova/virt/libvirt/lvm.py rename to nova/virt/libvirt/storage/lvm.py diff --git a/nova/virt/libvirt/rbd_utils.py b/nova/virt/libvirt/storage/rbd_utils.py similarity index 100% rename from nova/virt/libvirt/rbd_utils.py rename to nova/virt/libvirt/storage/rbd_utils.py