Display Le if legacy metadata version

Signed-off-by: mulhern <[email protected]>
stratis-storage · Sep 15, 2023 · 1f813ea · 1f813ea
1 parent 4a08a4c
commit 1f813ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/docs/stratis.txt b/docs/stratis.txt
@@ -215,9 +215,9 @@ Properties::
           property, a '~', for negation, is prepended to the property code.
           If the engine experienced an error when obtaining the property, a
           "?", representing "unknown", is prepended to the property code.
-          The property codes are: Ca - indicates the pool has a cache,
-          Cr - indicates the pool is encrypted, Op - indicates the pool allows
-          overprovisioning.
+          The property codes are: Le - indicates that the pool is a legacy pool,
+          Ca - indicates the pool has a cache, Cr - indicates the pool is
+          encrypted, Op - indicates the pool allows overprovisioning.
 UUID::
           The UUID of the pool.
 Alerts::

diff --git a/src/stratis_cli/_actions/_list_pool.py b/src/stratis_cli/_actions/_list_pool.py
@@ -332,25 +332,18 @@ def gen_string(has_property, code):
                 """
                 Generate the display string for a boolean property
 
-                :param has_property: whether the property is true or false
-                :type has_property: bool or object
+                :param bool has_property: whether the property is true or false
                 :param str code: the code to generate the string for
                 :returns: the generated string
                 :rtype: str
                 """
-                # must check membership in dbus.Boolean, because dbus.Boolean is
-                # not a subclass of bool, but of int.
-                prefix = (
-                    "?"
-                    if not isinstance(has_property, Boolean)
-                    else (" " if has_property else "~")
-                )
-                return prefix + code
+                return (" " if has_property else "~") + code
 
             props_list = [
-                (mopool.HasCache(), "Ca"),
-                (mopool.Encrypted(), "Cr"),
-                (mopool.Overprovisioning(), "Op"),
+                (int(mopool.MetadataVersion()) == 1, "Le"),
+                (bool(mopool.HasCache()), "Ca"),
+                (bool(mopool.Encrypted()), "Cr"),
+                (bool(mopool.Overprovisioning()), "Op"),
             ]
             return ",".join(gen_string(x, y) for x, y in props_list)