swap: Use libblockdev to check label and UUID format

blivet/formats/swap.py

@@ -26,7 +26,6 @@
 from ..errors import FSWriteUUIDError, SwapSpaceError
 from ..storage_log import log_method_call
 from ..tasks import availability
-from ..tasks import fsuuid
 from . import DeviceFormat, register_device_format
 from ..size import Size
 from .. import udev
@@ -114,8 +113,13 @@ def relabels(self):
         return True and self._plugin.available
 
     def label_format_ok(self, label):
-        """Returns True since no known restrictions on the label."""
-        return True
+        """Check whether the given label is correct (16 characters or shorter)."""
+        try:
+            blockdev.swap.check_label(label)
+        except blockdev.SwapError:
+            return False
+        else:
+            return True
 
     def write_label(self, dry_run=False):
         """ Create a label for this format.
@@ -154,7 +158,12 @@ def write_label(self, dry_run=False):
 
     def uuid_format_ok(self, uuid):
         """Check whether the given UUID is correct according to RFC 4122."""
-        return fsuuid.FSUUID._check_rfc4122_uuid(uuid)
+        try:
+            blockdev.swap.check_uuid(uuid)
+        except blockdev.SwapError:
+            return False
+        else:
+            return True
 
     def _set_priority(self, priority):
         # pylint: disable=attribute-defined-outside-init

tests/unit_tests/formats_tests/swap_test.py

@@ -20,3 +20,14 @@ def test_swap_max_size(self):
         with six.assertRaisesRegex(self, DeviceError, "device is too large for new format"):
             StorageDevice("dev", size=Size("17 TiB"),
                           fmt=get_format("swap"))
+
+    def test_swap_uuid_format(self):
+        fmt = get_format("swap")
+
+        # label -- at most 16 characters
+        self.assertTrue(fmt.label_format_ok("label"))
+        self.assertFalse(fmt.label_format_ok("a" * 17))
+
+        # uuid -- RFC 4122 format
+        self.assertTrue(fmt.uuid_format_ok("01234567-1234-1234-1234-012345678911"))
+        self.assertFalse(fmt.uuid_format_ok("aaaa"))