Move mkfs from libvirt.utils to utils

Related to blueprint xenapi-config-drive

Move mkfs function to nova.utils, so configdrive module does not depend
on the libvirt module. This way, the configdrive module could be used
by other virt modules.

Change-Id: Ibda2aacfa0b66bc087e397df1474b5dfbe86d923

4 files changed, 15 insertions, 17 deletions

diff --git a/nova/tests/fake_libvirt_utils.py b/nova/tests/fake_libvirt_utils.py
index 4f7c96d4f..020ff8192 100644
--- a/nova/tests/fake_libvirt_utils.py
+++ b/nova/tests/fake_libvirt_utils.py
@@ -48,10 +48,6 @@ def copy_image(src, dest):
     pass
 
 
-def mkfs(fs, path):
-    pass
-
-
 def resize2fs(path):
     pass
 
diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py
index 77c9d12a6..922dc3613 100644
--- a/nova/tests/test_configdrive2.py
+++ b/nova/tests/test_configdrive2.py
@@ -26,7 +26,6 @@ from nova import flags
 from nova.openstack.common import log
 from nova import utils
 from nova.virt import configdrive
-from nova.virt.libvirt import utils as virtutils
 
 
 FLAGS = flags.FLAGS
@@ -67,12 +66,12 @@ class ConfigDriveTestCase(test.TestCase):
     def test_create_configdrive_vfat(self):
         imagefile = None
         try:
-            self.mox.StubOutWithMock(virtutils, 'mkfs')
+            self.mox.StubOutWithMock(utils, 'mkfs')
             self.mox.StubOutWithMock(utils, 'execute')
             self.mox.StubOutWithMock(utils, 'trycmd')
 
-            virtutils.mkfs('vfat', mox.IgnoreArg(),
-                           label='config-2').AndReturn(None)
+            utils.mkfs('vfat', mox.IgnoreArg(),
+                       label='config-2').AndReturn(None)
             utils.trycmd('mount', '-o', 'loop', mox.IgnoreArg(),
                          mox.IgnoreArg(),
                          run_as_root=True).AndReturn((None, None))
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 43b4d4813..b12a7a3ea 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -3566,15 +3566,6 @@ disk size: 4.4M''', ''))
         finally:
             os.unlink(dst_path)
 
-    def test_mkfs(self):
-        self.mox.StubOutWithMock(utils, 'execute')
-        utils.execute('mkfs', '-t', 'ext4', '-F', '/my/block/dev')
-        utils.execute('mkswap', '/my/swap/block/dev')
-        self.mox.ReplayAll()
-
-        libvirt_utils.mkfs('ext4', '/my/block/dev')
-        libvirt_utils.mkfs('swap', '/my/swap/block/dev')
-
     def test_write_to_file(self):
         dst_fd, dst_path = tempfile.mkstemp()
         try:
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 531778212..dbd2c1cbe 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -768,6 +768,18 @@ class DiffDict(test.TestCase):
         self.assertEqual(diff, dict(b=['-']))
 
 
+class MkfsTestCase(test.TestCase):
+
+    def test_mkfs(self):
+        self.mox.StubOutWithMock(utils, 'execute')
+        utils.execute('mkfs', '-t', 'ext4', '-F', '/my/block/dev')
+        utils.execute('mkswap', '/my/swap/block/dev')
+        self.mox.ReplayAll()
+
+        utils.mkfs('ext4', '/my/block/dev')
+        utils.mkfs('swap', '/my/swap/block/dev')
+
+
 class EnsureTree(test.TestCase):
     def test_ensure_tree(self):
         with utils.tempdir() as tmpdir: