api: don't raise 400 in MeasuresListSchema

voluptous schema must not abort() but raise an exception
otherwise, we can't mix them in voluptous.Any/voluptous.All/...

gnocchi/rest/api.py

@@ -148,18 +148,24 @@ def deserialize(expected_content_types=None):
     return params
 
 
-def validate(schema, data, required=True):
+def validate(schema, data, required=True, detailed_exc=False):
     try:
         return voluptuous.Schema(schema, required=required)(data)
     except voluptuous.Error as e:
-        abort(400, "Invalid input: %s" % e)
+        if detailed_exc:
+            abort(400, {"cause": "Invalid input",
+                        "detail": str(e)})
+        else:
+            abort(400, "Invalid input: %s" % e)
 
 
 def deserialize_and_validate(schema, required=True,
-                             expected_content_types=None):
+                             expected_content_types=None,
+                             detailed_exc=False):
     return validate(schema,
                     deserialize(expected_content_types=expected_content_types),
-                    required)
+                    required,
+                    detailed_exc)
 
 
 def Timespan(value):
@@ -434,14 +440,14 @@ def MeasuresListSchema(measures):
     try:
         times = utils.to_timestamps([m['timestamp'] for m in measures])
     except TypeError:
-        abort(400, "Invalid format for measures")
+        raise voluptuous.Invalid("unexpected measures format")
     except ValueError as e:
-        abort(400, "Invalid input for timestamp: %s" % e)
+        raise voluptuous.Invalid("unexpected timestamp '%s'" % e)
 
     try:
         values = [float(i['value']) for i in measures]
     except Exception:
-        abort(400, "Invalid input for a value")
+        raise voluptuous.Invalid("unexpected measures value")
 
     return (incoming.Measure(t, v) for t, v in six.moves.zip(times, values))
 
@@ -462,15 +468,13 @@ def get_all(self):
         self.enforce_metric("get metric")
         return self.metric
 
-    @pecan.expose()
+    @pecan.expose('json')
     def post_measures(self):
         self.enforce_metric("post measures")
-        params = deserialize()
-        if not isinstance(params, list):
-            abort(400, "Invalid input for measures")
-        if params:
-            pecan.request.incoming.add_measures(
-                self.metric.id, MeasuresListSchema(params))
+        measures = deserialize_and_validate(MeasuresListSchema,
+                                            detailed_exc=True)
+        if measures:
+            pecan.request.incoming.add_measures(self.metric.id, measures)
         pecan.response.status = 202
 
     @pecan.expose('json')
@@ -2105,10 +2109,10 @@ def post(self):
                             attrs.get("instance", "none"))
             name = attrs['__name__']
             if ts.samples:
-                measures_by_rid[original_rid][name] = (
-                    MeasuresListSchema([{'timestamp': s.timestamp_ms / 1000.0,
-                                         'value': s.value}
-                                        for s in ts.samples]))
+                data = [{'timestamp': s.timestamp_ms / 1000.0,
+                         'value': s.value} for s in ts.samples]
+                measures_by_rid[original_rid][name] = validate(
+                    MeasuresListSchema, data, detailed_exc=True)
 
         creator = pecan.request.auth_helper.get_current_user(pecan.request)
 

gnocchi/tests/functional/gabbits/batch-measures.yaml

@@ -275,4 +275,4 @@ tests:
             - [ "2015-03-06T14:34:12", 12]
       status: 400
       response_strings:
-        - "Invalid format for measures"
+        - "unexpected measures format"

gnocchi/tests/functional/gabbits/metric.yaml

@@ -249,6 +249,18 @@ tests:
             value: -23
       status: 202
 
+    - name: push measurements with wrong measure objects
+      POST: /v1/metric/$HISTORY['list valid metrics'].$RESPONSE['$[0].id']/measures
+      request_headers:
+        accept: application/json
+      data:
+        - [ "2015-03-06T14:33:57", 43.1]
+        - [ "2015-03-06T14:34:12", 12]
+      status: 400
+      response_json_paths:
+        $.description.cause: "Invalid input"
+        $.description.detail: "unexpected measures format"
+
     - name: refresh metric
       GET: /v1/metric/$HISTORY['list valid metrics'].$RESPONSE['$[0].id']/measures?refresh=true