x/vmtp
Code Issues Proposed changes

Use prettytable to support fixed width column

Browse Source 
Change-Id: Ib716e7b7b215ad1fae6e34a25e6db98687891a1e
This commit is contained in:
Yichen Wang 2015-06-15 12:31:38 -07:00
parent b2174aad2b
commit 537a157059
3 changed files with 13 additions and 5 deletions

2
doc/source/usage.rst

@ -21,7 +21,7 @@ VMTP Usage
[--stop-on-error] [--vm-image-url <url_to_image>] [--stop-on-error] [--vm-image-url <url_to_image>]
[--test-description <test_description>] [--test-description <test_description>]
OpenStack VM Throughput V2.1.0 OpenStack VM Throughput V2.1.1
optional arguments: optional arguments:
-h, --help show this help message and exit -h, --help show this help message and exit

1
requirements.txt

@ -12,6 +12,7 @@ jsonschema>=2.4.0
lxml>=3.4.0 lxml>=3.4.0
oslo.utils>=1.2.0 oslo.utils>=1.2.0
paramiko>=1.14.0 paramiko>=1.14.0
prettytable>=0.7.2
pycrypto>=2.6.1 pycrypto>=2.6.1
pymongo>=2.7.2 pymongo>=2.7.2
python-glanceclient>=0.15.0 python-glanceclient>=0.15.0

15
vmtp.py

@ -38,9 +38,9 @@ from keystoneclient.v2_0 import client as keystoneclient
from neutronclient.v2_0 import client as neutronclient from neutronclient.v2_0 import client as neutronclient
from novaclient.client import Client from novaclient.client import Client
from novaclient.exceptions import ClientException from novaclient.exceptions import ClientException
from tabulate import tabulate from prettytable import PrettyTable
__version__ = '2.1.0' __version__ = '2.1.1'
from perf_instance import PerfInstance as PerfInstance from perf_instance import PerfInstance as PerfInstance
@ -604,7 +604,7 @@ def print_report(results):
if run_status[idx0][idx1][idx2][idx3] == SPASS: if run_status[idx0][idx1][idx2][idx3] == SPASS:
run_data[idx0][idx1][idx2][idx3] = gen_report_data(proto, res) run_data[idx0][idx1][idx2][idx3] = gen_report_data(proto, res)
table = [['Scenario', 'Scenario Name', 'Functional Status', 'Data']] table = []
scenario = 0 scenario = 0
for idx0, net in enumerate(['Same Network', 'Different Network']): for idx0, net in enumerate(['Same Network', 'Different Network']):
for idx1, ip in enumerate(['Fixed IP', 'Floating IP']): for idx1, ip in enumerate(['Fixed IP', 'Floating IP']):
@ -628,13 +628,20 @@ def print_report(results):
cnt_valid = len(table) - 1 - cnt_skipped cnt_valid = len(table) - 1 - cnt_skipped
passed_rate = float(cnt_passed) / cnt_valid * 100 if cnt_valid != 0 else 0 passed_rate = float(cnt_passed) / cnt_valid * 100 if cnt_valid != 0 else 0
failed_rate = float(cnt_failed) / cnt_valid * 100 if cnt_valid != 0 else 0 failed_rate = float(cnt_failed) / cnt_valid * 100 if cnt_valid != 0 else 0
ptable = PrettyTable(['Scenario', 'Scenario Name', 'Functional Status', 'Data'])
ptable.align = "l"
ptable.max_width = 80
for row in table:
ptable.add_row(row)
print "\nSummary of results" print "\nSummary of results"
print "==================" print "=================="
print "Total Scenarios: %d" % (len(table) - 1) print "Total Scenarios: %d" % (len(table) - 1)
print "Passed Scenarios: %d [%.2f%%]" % (cnt_passed, passed_rate) print "Passed Scenarios: %d [%.2f%%]" % (cnt_passed, passed_rate)
print "Failed Scenarios: %d [%.2f%%]" % (cnt_failed, failed_rate) print "Failed Scenarios: %d [%.2f%%]" % (cnt_failed, failed_rate)
print "Skipped Scenarios: %d" % (cnt_skipped) print "Skipped Scenarios: %d" % (cnt_skipped)
print tabulate(table, headers="firstrow", tablefmt="psql", stralign="left") print ptable
if __name__ == '__main__': if __name__ == '__main__':