From 3a10e745e263466bcef039d1e46255954e7f21ac Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 28 Jun 2018 10:12:46 -0400 Subject: [PATCH] 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 --- .../cgts-client/cgtsclient/v1/ilvg_shell.py | 10 +++++++++- sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lvg.py | 11 ++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sysinv/cgts-client/cgts-client/cgtsclient/v1/ilvg_shell.py b/sysinv/cgts-client/cgts-client/cgtsclient/v1/ilvg_shell.py index 09c3b8af64..d9c9f7fa03 100644 --- a/sysinv/cgts-client/cgts-client/cgtsclient/v1/ilvg_shell.py +++ b/sysinv/cgts-client/cgts-client/cgtsclient/v1/ilvg_shell.py @@ -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) diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lvg.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lvg.py index b8ea11f587..2e3a83d662 100644 --- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lvg.py +++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lvg.py @@ -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