From 7d69a1eae658fae6c7437e0a8316312cb625acb5 Mon Sep 17 00:00:00 2001 From: akhilbatra898 Date: Sat, 18 Mar 2017 14:16:26 +0530 Subject: Add unit tests for List and get in API. - refactor controllers - remove abspath and other irrelvant data in response - move fixtures - refactor decorators JIRA: QTIP-226 Change-Id: I5fac5b1bc998da198098992e7ddb47ba49685f31 Signed-off-by: akhilbatra898 (cherry picked from commit bef693f40ad87170b7233b9fef62f2fd8abfc8d8) --- qtip/api/controllers/metric.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'qtip/api/controllers/metric.py') 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 -- cgit 1.2.3-korg