Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/stratis_cli/_actions/_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
SECTOR_SIZE = 512

MAXIMUM_STRATISD_VERSION = "4.0.0"
MINIMUM_STRATISD_VERSION = "3.9.2"
MINIMUM_STRATISD_VERSION = "3.10.0"
assert Version(MINIMUM_STRATISD_VERSION) < Version(MAXIMUM_STRATISD_VERSION)

REVISION = f"r{MINIMUM_STRATISD_VERSION.split('.')[1]}"
Expand Down
21 changes: 11 additions & 10 deletions src/stratis_cli/_actions/_introspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</signal>
</interface>
""",
"org.storage.stratis3.Manager.r9": """
<interface name="org.storage.stratis3.Manager.r9">
"org.storage.stratis3.Manager.r10": """
<interface name="org.storage.stratis3.Manager.r10">
<method name="CreatePool">
<arg name="name" type="s" direction="in" />
<arg name="devices" type="as" direction="in" />
Expand Down Expand Up @@ -84,8 +84,8 @@
</property>
</interface>
""",
"org.storage.stratis3.Report.r9": """
<interface name="org.storage.stratis3.Report.r9">
"org.storage.stratis3.Report.r10": """
<interface name="org.storage.stratis3.Report.r10">
<method name="GetReport">
<arg name="name" type="s" direction="in" />
<arg name="result" type="s" direction="out" />
Expand All @@ -94,8 +94,8 @@
</method>
</interface>
""",
"org.storage.stratis3.blockdev.r9": """
<interface name="org.storage.stratis3.blockdev.r9">
"org.storage.stratis3.blockdev.r10": """
<interface name="org.storage.stratis3.blockdev.r10">
<property name="Devnode" type="s" access="read">
<annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
</property>
Expand All @@ -122,8 +122,8 @@
</property>
</interface>
""",
"org.storage.stratis3.filesystem.r9": """
<interface name="org.storage.stratis3.filesystem.r9">
"org.storage.stratis3.filesystem.r10": """
<interface name="org.storage.stratis3.filesystem.r10">
<method name="SetName">
<arg name="name" type="s" direction="in" />
<arg name="result" type="(bs)" direction="out" />
Expand All @@ -150,8 +150,8 @@
</property>
</interface>
""",
"org.storage.stratis3.pool.r9": """
<interface name="org.storage.stratis3.pool.r9">
"org.storage.stratis3.pool.r10": """
<interface name="org.storage.stratis3.pool.r10">
<method name="AddCacheDevs">
<arg name="devices" type="as" direction="in" />
<arg name="results" type="(bao)" direction="out" />
Expand Down Expand Up @@ -280,6 +280,7 @@
<property name="HasCache" type="b" access="read" />
<property name="KeyDescriptions" type="v" access="read" />
<property name="LastReencryptedTimestamp" type="(bs)" access="read" />
<property name="MetadataUsed" type="s" access="read" />
<property name="MetadataVersion" type="t" access="read">
<annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
</property>
Expand Down
8 changes: 8 additions & 0 deletions src/stratis_cli/_actions/_list_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,9 +515,17 @@ def size_str(value: Range | None) -> str:
allocated_size = Range(mopool.AllocatedSize())
except DbusClientMissingPropertyError:
allocated_size = None

print(f" Allocated: {size_str(allocated_size)}")
print(f" Used: {size_str(size_triple.used())}")

try:
metadata_used = Range(mopool.MetadataUsed())
except DbusClientMissingPropertyError:
metadata_used = None

print(f" Metadata: {size_str(metadata_used)}")

def display(self):
"""
List a single pool in detail.
Expand Down
2 changes: 1 addition & 1 deletion src/stratis_cli/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
.. moduleauthor:: mulhern <amulhern@redhat.com>
"""

__version_info__ = (3, 9, 1)
__version_info__ = (3, 10, 0)
__version__ = ".".join(str(x) for x in __version_info__)
Loading