diff options
author | John Estabrook <jestabro@vyos.io> | 2023-10-20 23:47:20 -0500 |
---|---|---|
committer | John Estabrook <jestabro@vyos.io> | 2023-11-15 11:29:04 -0600 |
commit | 8efab9ee8cdb0e65dddb9d3ba97de8ddcf3666dc (patch) | |
tree | 955d57ceef4fb18ff8028bf54652361817d77b4c /src | |
parent | fcded7930b5426193e8490c6df2a70e300a60e31 (diff) | |
download | vyos-1x-8efab9ee8cdb0e65dddb9d3ba97de8ddcf3666dc.tar.gz vyos-1x-8efab9ee8cdb0e65dddb9d3ba97de8ddcf3666dc.zip |
image: T4516: improve format of 'show system image details'
Diffstat (limited to 'src')
-rwxr-xr-x | src/op_mode/image_info.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/op_mode/image_info.py b/src/op_mode/image_info.py index ae0677196..14dca7476 100755 --- a/src/op_mode/image_info.py +++ b/src/op_mode/image_info.py @@ -20,11 +20,11 @@ import sys from typing import List, Union -from hurry.filesize import size from tabulate import tabulate from vyos import opmode from vyos.system import disk, grub, image +from vyos.utils.convert import bytes_to_human def _format_show_images_summary(images_summary: image.BootDetails) -> str: @@ -58,11 +58,15 @@ def _format_show_images_details( for image_item in images_details: name: str = image_item.get('name') version: str = image_item.get('version') - disk_ro: int = size(image_item.get('disk_ro')) - disk_rw: int = size(image_item.get('disk_rw')) - disk_total: int = size(image_item.get('disk_total')) + disk_ro: str = bytes_to_human(image_item.get('disk_ro'), + precision=1, int_below_exponent=30) + disk_rw: str = bytes_to_human(image_item.get('disk_rw'), + precision=1, int_below_exponent=30) + disk_total: str = bytes_to_human(image_item.get('disk_total'), + precision=1, int_below_exponent=30) table_data.append([name, version, disk_ro, disk_rw, disk_total]) - tabulated: str = tabulate(table_data, headers) + tabulated: str = tabulate(table_data, headers, + colalign=('left', 'left', 'right', 'right', 'right')) return tabulated |