diff --git a/requirements.txt b/requirements.txt index 20a40e2..4bb879a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ python-novaclient sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 psutil>=1.1.1,<2.0.0 tooz>=1.19.0 # Apache-2.0 +PrettyTable>=0.7,<0.8 diff --git a/scalpels/cli/actions/report.py b/scalpels/cli/actions/report.py index 54a6750..641005e 100644 --- a/scalpels/cli/actions/report.py +++ b/scalpels/cli/actions/report.py @@ -3,6 +3,14 @@ # Author: Kun Huang from scalpels.db import api as db_api +from prettytable import PrettyTable + + +def pprint_result(result): + t = PrettyTable(["timestamp", "%s(%s)" % (result.name, result.unit)]) + for data in result.data: + t.add_row([data[0], data[1][:100]]) + print t LOWEST=8 @@ -29,8 +37,6 @@ def run(config): print "command report: %s" % config print "task: <%s>" % task.uuid - results = [] for ret_uuid in task.results: ret = db_api.result_get(ret_uuid) - results.append(ret.data) - print "result <%s>, data: %s, unit: %s, name: %s" % (ret.uuid, ret.data, ret.unit, ret.name) + pprint_result(ret) diff --git a/scalpels/cli/actions/result.py b/scalpels/cli/actions/result.py index 137f81a..4cf45d3 100644 --- a/scalpels/cli/actions/result.py +++ b/scalpels/cli/actions/result.py @@ -3,9 +3,10 @@ # Author: Kun Huang from scalpels.db import api as db_api +from scalpels.cli.actions import report def run(config): if config.get("list"): rets = db_api.get_all_results() for ret in rets: - print ret.uuid, ret.data + report.pprint_result(ret)