diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-03-28 01:45:00 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-03-28 01:45:00 +0000 |
commit | 4fda4a5819fda210ed824c504d4bed1751f8f51a (patch) | |
tree | 892ca5677b8a0989a8a87ee0db99d19da11cf001 /qtip/api/controllers/metric.py | |
parent | 686c7023613491a99c8e2ada758edb720655a6e6 (diff) | |
parent | 7d69a1eae658fae6c7437e0a8316312cb625acb5 (diff) |
Merge "Add unit tests for List and get in API." into stable/danube
Diffstat (limited to 'qtip/api/controllers/metric.py')
-rw-r--r-- | qtip/api/controllers/metric.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/qtip/api/controllers/metric.py b/qtip/api/controllers/metric.py index dd4c8ac6..96cd985c 100644 --- a/qtip/api/controllers/metric.py +++ b/qtip/api/controllers/metric.py @@ -14,13 +14,12 @@ from qtip.loader import metric def list_metrics(): - metric_list = list(metric.MetricSpec.list_all()) - return metric_list, httplib.OK + metrics = list(metric.MetricSpec.list_all()) + metrics_by_name = [m['name'] for m in metrics] + return {'metrics': metrics_by_name}, httplib.OK -@common.get_one_exceptions(resource='metric') +@common.check_endpoint_for_error(resource='Metric') def get_metric(name): - metric_spec = metric.MetricSpec(name) - return {'name': metric_spec.name, - 'abspath': metric_spec.abspath, - 'content': metric_spec.content} + metric_spec = metric.MetricSpec(name) + return metric_spec.content |