Merge pull request #937 from vojtechtrefny/master_vdo-pool-lv-type

Set LogicalVolume.Type to "vdopool" for LVM VDO pools
storaged-project · Nov 29, 2021 · 9b39fe8 · 9b39fe8
2 parents f637bce + 8c0039e
commit 9b39fe8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml b/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
@@ -427,11 +427,13 @@
 
     <!-- Type:
 
-         The general type of a logical volume. One of "block" or
-         "pool". More types might be defined in the future.
+         The general type of a logical volume. One of "block", "pool"
+         or "vdopool". More types might be defined in the future.
 
          A volume of type "block" can be used as a block device. A
          volume of type "pool" can be used to create thin volumes.
+         A volume of type "vdopool" is the internal pool for the
+         VDO logical volume device.
     -->
     <property name="Type" type="s" access="read"/>
 

diff --git a/modules/lvm2/udiskslinuxlogicalvolume.c b/modules/lvm2/udiskslinuxlogicalvolume.c
@@ -173,6 +173,8 @@ udisks_linux_logical_volume_update (UDisksLinuxLogicalVolume     *logical_volume
 
       if (target_type == 't' && volume_type == 't')
         type = "pool";
+      else if (volume_type == 'd')
+        type = "vdopool";
       if (meta_lv_info && meta_lv_info->size)
         size += meta_lv_info->size;
 

diff --git a/src/tests/dbus-tests/test_20_LVM.py b/src/tests/dbus-tests/test_20_LVM.py
@@ -494,6 +494,9 @@ def test_create(self):
         dbus_size = self.get_property(pool, '.LogicalVolume', 'Size')
         dbus_size.assertEqual(psize)
 
+        dbus_type = self.get_property(lv, '.LogicalVolume', 'Type')
+        dbus_type.assertNotEqual('vdopool')
+
         # VDO properties
         dbus_comp = self.get_property(lv, '.VDOVolume', 'Compression')
         dbus_comp.assertTrue()