starlingx
/
config
Code Issues Proposed changes

Show instance_lv_size in GiB instead of MiB 

This commit modifies cgtsclient code to show instance_lv_size in GiB
instead of MiB.

Story: 2002873
Task: 22825

Change-Id: I3694ab37dc53f052f88e99e7f8d77905db82ab97
Signed-off-by: Jack Ding <jack.ding@windriver.com>
This commit is contained in:
Wei Zhou 2018-06-28 10:12:46 -04:00 committed by Jack Ding
parent 1c64e65c45
commit 3a10e745e2
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysinv/cgts-client/cgts-client/cgtsclient/v1/ilvg_shell.py
View File

@ -34,8 +34,16 @@ def _print_ilvg_show(ilvg):
data = [(f, getattr(ilvg, f, '')) for f in fields]
attr = getattr(ilvg, 'capabilities', '')
if attr:
lv_size_mib = attr.pop('instances_lv_size_mib', None)
if lv_size_mib:
lv_size_gib = float(lv_size_mib) / 1024
attr.update({'instances_lv_size_gib': lv_size_gib})
# rename capabilities for display purposes and add to display list
data.append(('parameters', getattr(ilvg, 'capabilities', '')))
data.append(('parameters', attr))
utils.print_tuple_list(data, labels)

11
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lvg.py
View File

@ -653,11 +653,12 @@ def _check(op, lvg):
(lv_size_mib > allowed_max_mib)):
raise wsme.exc.ClientSideError(
_('Invalid size provided for '
'instances_lv_size_mib: %d. The valid range, '
'based on the volume group size is %d <= '
'instances_lv_size_mib <= %d.' %
(lvg_caps[constants.LVG_NOVA_PARAM_INST_LV_SZ],
allowed_min_mib, allowed_max_mib)))
'instances_lv_size_gib: %.2f. The valid range, '
'based on the volume group size is %.2f <= '
'instances_lv_size_gib <= %.2f.' %
(float(lvg_caps[constants.LVG_NOVA_PARAM_INST_LV_SZ]) / 1024,
float(allowed_min_mib) / 1024,
float(allowed_max_mib) / 1024)))
# remote instance backing only available for ceph only cinder
# backend. for Titanium Cloud that is initially configured as