diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-20 12:58:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-20 12:58:47 +0000 |
| commit | 1227dc7e737e9946f316c7693232a9f5cbe166ed (patch) | |
| tree | ef5864102712a9cfbca26c511fabfd270e896746 /qtip | |
| parent | a1325130fdbbab0c58a08d636b8c0419504020a8 (diff) | |
| parent | 90e6893b967cded4bf45380d643d3bfcb19ce0d4 (diff) | |
Merge "Set default width to 80 for justify filter"
Diffstat (limited to 'qtip')
| -rw-r--r-- | qtip/reporter/filters.py | 2 | ||||
| -rw-r--r-- | qtip/reporter/templates/base.j2 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qtip/reporter/filters.py b/qtip/reporter/filters.py index dc46e195..c0c379df 100644 --- a/qtip/reporter/filters.py +++ b/qtip/reporter/filters.py @@ -8,7 +8,7 @@ ############################################################################## -def justify(pair, width=100, padding_with='.'): +def justify(pair, width=80, padding_with='.'): """align first element along the left margin, second along the right, padding spaces""" n = width - len(pair[0]) return '{key}{value:{c}>{n}}'.format(key=pair[0], value=pair[1], c=padding_with, n=n) diff --git a/qtip/reporter/templates/base.j2 b/qtip/reporter/templates/base.j2 index 34242b40..5dafc8b1 100644 --- a/qtip/reporter/templates/base.j2 +++ b/qtip/reporter/templates/base.j2 @@ -1,4 +1,4 @@ -{{ '=' * 100}} +{{ ('=', '=')|justify }} {{ ('Plan Name', plan_name)|justify }} {{ ('Start Time', start_time)|justify }} {{ ('Stop Time', stop_time)|justify }} @@ -14,7 +14,7 @@ {% include '%s.j2' % metric_name %} {% endif %} System Information -{{ ('CPU Brand', bm.sysinfo.cpu)|justify }} +{{ ('CPU', bm.sysinfo.cpu)|justify }} {{ ('Disk', bm.sysinfo.disk)|justify }} {{ ('Host Name', bm.sysinfo.hostname)|justify }} {{ ('Kernel', bm.sysinfo.kernel)|justify }} @@ -25,5 +25,5 @@ System Information {%- endfor -%} {% endfor %} -{{ '\033[93m' }} {{ '*' * 100}} {{ '\033[0m' }} +{{ ('\033[93m*', '*\033[0m')|justify }} {%- endfor -%} |