[SPEC] Renamed benchmark endpoints

benchmark.submit -> benchmark
benchmark.list   -> list_benchmarks
benchmark.abort  -> abort_benchmark

And fixed the related tests

rest-api-spec/api/abort_benchmark.json

@@ -1,5 +1,5 @@
 {
-    "benchmark.abort" : {
+    "abort_benchmark" : {
         "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-benchmark.html",
         "methods": ["POST"],
         "url": {

rest-api-spec/api/benchmark.json

@@ -1,5 +1,5 @@
 {
-    "benchmark.submit" : {
+    "benchmark" : {
         "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-benchmark.html",
         "methods": ["PUT"],
         "url": {
@@ -16,7 +16,6 @@
                 },
                 "type": {
                     "type" : "string",
-                    "required" : true,
                     "description" : "The name of the document type"
                 }
             },

rest-api-spec/api/list_benchmarks.json

@@ -1,5 +1,5 @@
 {
-    "benchmark.list" : {
+    "list_benchmarks" : {
         "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-benchmark.html",
         "methods": ["GET"],
         "url": {
@@ -16,7 +16,6 @@
                 },
                 "type": {
                     "type" : "string",
-                    "required" : true,
                     "description" : "The name of the document type"
                 }
             },

rest-api-spec/test/abort_benchmark/10_basic.yaml

@@ -2,7 +2,7 @@
 "Test benchmark abort":
 
   - do:
-        benchmark.abort:
+        abort_benchmark:
             name: my_benchmark
         catch: request
 

rest-api-spec/test/benchmark.list/10_basic.yaml

@@ -1,7 +0,0 @@
----
-"Test benchmark list":
-
-  - do:
-        benchmark.list: {}
-        catch: request
-

rest-api-spec/test/benchmark.submit/10_basic.yaml

@@ -1,32 +0,0 @@
----
-"Test benchmark submit":
-
-  - do:
-      indices.create:
-        index: test_1
-        body:
-          settings:
-            index:
-              number_of_replicas: 0
-
-  - do:
-      cluster.health:
-        wait_for_status: yellow
-
-  - do:
-        benchmark.submit:
-            index: test_1
-            body: {
-                    "name": "my_benchmark",
-                    "competitors": [ {
-                        "name": "my_competitor",
-                        "requests": [ {
-                            "query": {
-                                "match": { "_all": "*" }
-                            }
-                        } ]
-                    } ]
-                }
-        catch: request
-
-

rest-api-spec/test/benchmark/10_basic.yaml

@@ -0,0 +1,30 @@
+---
+"Test benchmark submit":
+
+  - do:
+      indices.create:
+        index: test_1
+        body:
+          settings:
+            index:
+              number_of_replicas: 0
+
+  - do:
+      cluster.health:
+        wait_for_status: yellow
+
+  - do:
+        benchmark:
+            index: test_1
+            body:
+                    "name": "my_benchmark"
+                    "competitors":
+                      -
+                        "name": "my_competitor"
+                        "requests":
+                          -
+                            "query":
+                                "match": { "_all": "*" }
+
+  - match: { status: complete }
+