Allow using uninitialized disks in device factory

Fixes: #725
Fixes: #1030

Author: vojtechtrefny

blivet/devicefactory.py

@@ -699,6 +699,26 @@ def _set_container_members(self):
     def _set_container_raid_level(self):
         pass
 
+    def _filter_disks(self, disks, min_free, initialize=True):
+        filtered_disks = []
+
+        for d in disks:
+            if not d.partitioned and d.format.type is None and initialize:
+                log.info("Partition set factory: initializing disk %s")
+                self.storage.initialize_disk(d)
+
+            if not d.partitioned and d.format.type is not None:
+                log.debug("Ignoring disk %s: format %s found on disk", d.name, d.format.type)
+            if not d.format.supported:
+                log.debug("Ignoring disk %s: format %s is not supported", d.name, d.format.name)
+            elif d.format.free < min_free:
+                log.debug("Ignoring disk %s: not enough free space. Required: %s, free: %s",
+                          d.name, min_free, d.format.free)
+            else:
+                filtered_disks.append(d)
+
+        return filtered_disks
+
     #
     # properties and methods related to the factory device
     #
@@ -1086,15 +1106,7 @@ def _get_new_device(self, *args, **kwargs):
         return device
 
     def _configure(self):
-        disks = []
-        for disk in self.disks:
-            if not disk.partitioned:
-                log.debug("removing unpartitioned disk %s", disk.name)
-            elif not disk.format.supported:
-                log.debug("removing disk with unsupported format %s", disk.name)
-            else:
-                disks.append(disk)
-
+        disks = self._filter_disks(self.disks, min_free=Size(0))
         if not disks:
             raise DeviceFactoryError("no usable disks specified for partition")
 
@@ -1195,18 +1207,7 @@ def configure(self):
 
         # drop any new disks that don't have free space
         min_free = min(Size("500MiB"), self.parent_factory.size)
-
-        for d in add_disks:
-            if not d.partitioned:
-                log.debug("Ignoring disk %s: disk is not partitioned", d.name)
-            elif not d.format.supported:
-                log.debug("Ignoring disk %s: format %s is not supported", d.name, d.format.name)
-            elif d.format.free < min_free:
-                log.debug("Ignoring disk %s: not enough free space. Required: %s, free: %s",
-                          d.name, min_free, d.format.free)
-
-        add_disks = [d for d in add_disks if d.partitioned and
-                     d.format.supported and d.format.free >= min_free]
+        add_disks = self._filter_disks(add_disks, min_free)
 
         log.debug("add_disks: %s", [d.name for d in add_disks])
         log.debug("remove_disks: %s", [d.name for d in remove_disks])

tests/unit_tests/devicefactory_test.py

@@ -60,7 +60,9 @@ class DeviceFactoryTestCase(unittest.TestCase):
     def setUp(self, *args):  # pylint: disable=unused-argument,arguments-differ
         if self.device_type is None:
             raise unittest.SkipTest("abstract base class")
+        self._prepare_storage()
 
+    def _prepare_storage(self):
         self.b = blivet.Blivet()  # don't populate it
         self.disk_files = [create_sparse_tempfile("factorytest", self._disk_size),
                            create_sparse_tempfile("factorytest", self._disk_size)]
@@ -360,6 +362,18 @@ def _get_size_delta(self, devices=None):
         return delta
 
 
+class PartitionFactoryUnitializedTestCase(PartitionFactoryTestCase):
+    def _prepare_storage(self):
+        self.b = blivet.Blivet()  # don't populate it
+        self.disk_files = [create_sparse_tempfile("factorytest", self._disk_size),
+                           create_sparse_tempfile("factorytest", self._disk_size)]
+        for filename in self.disk_files:
+            disk = DiskFile(filename)
+            self.b.devicetree._add_device(disk)
+
+        self.addCleanup(self._clean_up_disk_files)
+
+
 class LVMFactoryTestCase(DeviceFactoryTestCase):
     device_class = LVMLogicalVolumeDevice
     device_type = devicefactory.DeviceTypes.LVM
@@ -601,6 +615,18 @@ def test_lv_unique_name(self, *args):  # pylint: disable=unused-argument,argumen
         self.assertEqual(device2.lvname, "name00")
 
 
+class LVMFactoryUninitializedTestCase(LVMFactoryTestCase):
+    def _prepare_storage(self):
+        self.b = blivet.Blivet()  # don't populate it
+        self.disk_files = [create_sparse_tempfile("factorytest", self._disk_size),
+                           create_sparse_tempfile("factorytest", self._disk_size)]
+        for filename in self.disk_files:
+            disk = DiskFile(filename)
+            self.b.devicetree._add_device(disk)
+
+        self.addCleanup(self._clean_up_disk_files)
+
+
 class LVMThinPFactoryTestCase(LVMFactoryTestCase):
     # TODO: check that the LV we get is a thin pool
     device_class = LVMLogicalVolumeDevice