summaryrefslogtreecommitdiffstats
path: root/qtip/api/controllers/metric.py
diff options
context:
space:
mode:
authorakhilbatra898 <akhil.batra@research.iiit.ac.in>2017-03-18 14:16:26 +0530
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-03-23 07:30:11 +0000
commit7d69a1eae658fae6c7437e0a8316312cb625acb5 (patch)
treeb84b51d4160459f0ed1b2fd9da403f6ddcd12372 /qtip/api/controllers/metric.py
parent05ef2c4f46a9dc7a704a290eb15817c80a52c2e6 (diff)
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 <akhil.batra@research.iiit.ac.in> (cherry picked from commit bef693f40ad87170b7233b9fef62f2fd8abfc8d8)
Diffstat (limited to 'qtip/api/controllers/metric.py')
-rw-r--r--qtip/api/controllers/metric.py13
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