From 53359c0d3d04b57d9c9bae10423a78f32f903c2f Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Thu, 16 Jan 2014 19:48:14 +0100
Subject: [PATCH] [SPEC] Created snapshot.* and nodes.* namespaces

Moved node_info, node_stats, shutdown and hot_threads into nodes.*
Moved snapshot and repository APIs into snapshot.*
---
 .../{cluster.node_hot_threads.json => nodes.hot_threads.json} | 4 ++--
 rest-api-spec/api/{cluster.node_info.json => nodes.info.json} | 2 +-
 .../api/{cluster.node_shutdown.json => nodes.shutdown.json}   | 2 +-
 .../api/{cluster.node_stats.json => nodes.stats.json}         | 2 +-
 .../{cluster.create_snapshot.json => snapshot.create.json}    | 2 +-
 ...create_repository.json => snapshot.create_repository.json} | 2 +-
 .../{cluster.delete_snapshot.json => snapshot.delete.json}    | 2 +-
 ...delete_repository.json => snapshot.delete_repository.json} | 2 +-
 .../api/{cluster.get_snapshot.json => snapshot.get.json}      | 2 +-
 ...uster.get_repository.json => snapshot.get_repository.json} | 2 +-
 .../{cluster.restore_snapshot.json => snapshot.restore.json}  | 2 +-
 .../test/{cluster.node_info => nodes.info}/10_basic.yaml      | 2 +-
 .../test/{cluster.node_stats => nodes.stats}/10_basic.yaml    | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
 rename rest-api-spec/api/{cluster.node_hot_threads.json => nodes.hot_threads.json} (94%)
 rename rest-api-spec/api/{cluster.node_info.json => nodes.info.json} (98%)
 rename rest-api-spec/api/{cluster.node_shutdown.json => nodes.shutdown.json} (96%)
 rename rest-api-spec/api/{cluster.node_stats.json => nodes.stats.json} (99%)
 rename rest-api-spec/api/{cluster.create_snapshot.json => snapshot.create.json} (97%)
 rename rest-api-spec/api/{cluster.create_repository.json => snapshot.create_repository.json} (95%)
 rename rest-api-spec/api/{cluster.delete_snapshot.json => snapshot.delete.json} (95%)
 rename rest-api-spec/api/{cluster.delete_repository.json => snapshot.delete_repository.json} (95%)
 rename rest-api-spec/api/{cluster.get_snapshot.json => snapshot.get.json} (96%)
 rename rest-api-spec/api/{cluster.get_repository.json => snapshot.get_repository.json} (95%)
 rename rest-api-spec/api/{cluster.restore_snapshot.json => snapshot.restore.json} (96%)
 rename rest-api-spec/test/{cluster.node_info => nodes.info}/10_basic.yaml (73%)
 rename rest-api-spec/test/{cluster.node_stats => nodes.stats}/10_basic.yaml (81%)

diff --git a/rest-api-spec/api/cluster.node_hot_threads.json b/rest-api-spec/api/nodes.hot_threads.json
similarity index 94%
rename from rest-api-spec/api/cluster.node_hot_threads.json
rename to rest-api-spec/api/nodes.hot_threads.json
index 3d87185a64d..752989916c0 100644
--- a/rest-api-spec/api/cluster.node_hot_threads.json
+++ b/rest-api-spec/api/nodes.hot_threads.json
@@ -1,9 +1,9 @@
 {
-  "cluster.node_hot_threads": {
+  "nodes.hot_threads": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-hot-threads.html",
     "methods": ["GET"],
     "url": {
-      "path": "/_cluster/nodes/hot_threads",
+      "path": "/_nodes/hot_threads",
       "paths": ["/_cluster/nodes/hotthreads", "/_cluster/nodes/hot_threads", "/_cluster/nodes/{node_id}/hotthreads", "/_cluster/nodes/{node_id}/hot_threads", "/_nodes/hotthreads", "/_nodes/hot_threads", "/_nodes/{node_id}/hotthreads", "/_nodes/{node_id}/hot_threads"],
       "parts": {
         "node_id": {
diff --git a/rest-api-spec/api/cluster.node_info.json b/rest-api-spec/api/nodes.info.json
similarity index 98%
rename from rest-api-spec/api/cluster.node_info.json
rename to rest-api-spec/api/nodes.info.json
index 8aca525fac6..c2b68c006a8 100644
--- a/rest-api-spec/api/cluster.node_info.json
+++ b/rest-api-spec/api/nodes.info.json
@@ -1,5 +1,5 @@
 {
-  "cluster.node_info": {
+  "nodes.info": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-info.html",
     "methods": ["GET"],
     "url": {
diff --git a/rest-api-spec/api/cluster.node_shutdown.json b/rest-api-spec/api/nodes.shutdown.json
similarity index 96%
rename from rest-api-spec/api/cluster.node_shutdown.json
rename to rest-api-spec/api/nodes.shutdown.json
index dad92f6c377..e6c6f36b7e9 100644
--- a/rest-api-spec/api/cluster.node_shutdown.json
+++ b/rest-api-spec/api/nodes.shutdown.json
@@ -1,5 +1,5 @@
 {
-  "cluster.node_shutdown": {
+  "nodes.shutdown": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-shutdown.html",
     "methods": ["POST"],
     "url": {
diff --git a/rest-api-spec/api/cluster.node_stats.json b/rest-api-spec/api/nodes.stats.json
similarity index 99%
rename from rest-api-spec/api/cluster.node_stats.json
rename to rest-api-spec/api/nodes.stats.json
index 157d4e3f29e..2c1858de270 100644
--- a/rest-api-spec/api/cluster.node_stats.json
+++ b/rest-api-spec/api/nodes.stats.json
@@ -1,5 +1,5 @@
 {
-  "cluster.node_stats": {
+  "nodes.stats": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html",
     "methods": ["GET"],
     "url": {
diff --git a/rest-api-spec/api/cluster.create_snapshot.json b/rest-api-spec/api/snapshot.create.json
similarity index 97%
rename from rest-api-spec/api/cluster.create_snapshot.json
rename to rest-api-spec/api/snapshot.create.json
index 867eb013dd1..5c3edf0f608 100644
--- a/rest-api-spec/api/cluster.create_snapshot.json
+++ b/rest-api-spec/api/snapshot.create.json
@@ -1,5 +1,5 @@
 {
-  "cluster.create_snapshot": {
+  "snapshot.create": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html",
     "methods": ["PUT", "POST"],
     "url": {
diff --git a/rest-api-spec/api/cluster.create_repository.json b/rest-api-spec/api/snapshot.create_repository.json
similarity index 95%
rename from rest-api-spec/api/cluster.create_repository.json
rename to rest-api-spec/api/snapshot.create_repository.json
index eafb199ff18..d5bc9502488 100644
--- a/rest-api-spec/api/cluster.create_repository.json
+++ b/rest-api-spec/api/snapshot.create_repository.json
@@ -1,5 +1,5 @@
 {
-  "cluster.create_repository": {
+  "snapshot.create_repository": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html",
     "methods": ["PUT", "POST"],
     "url": {
diff --git a/rest-api-spec/api/cluster.delete_snapshot.json b/rest-api-spec/api/snapshot.delete.json
similarity index 95%
rename from rest-api-spec/api/cluster.delete_snapshot.json
rename to rest-api-spec/api/snapshot.delete.json
index e8c89ed8280..cb58787e775 100644
--- a/rest-api-spec/api/cluster.delete_snapshot.json
+++ b/rest-api-spec/api/snapshot.delete.json
@@ -1,5 +1,5 @@
 {
-  "cluster.delete_snapshot": {
+  "snapshot.delete": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html",
     "methods": ["DELETE"],
     "url": {
diff --git a/rest-api-spec/api/cluster.delete_repository.json b/rest-api-spec/api/snapshot.delete_repository.json
similarity index 95%
rename from rest-api-spec/api/cluster.delete_repository.json
rename to rest-api-spec/api/snapshot.delete_repository.json
index fcd9dc5840a..3dba6da5184 100644
--- a/rest-api-spec/api/cluster.delete_repository.json
+++ b/rest-api-spec/api/snapshot.delete_repository.json
@@ -1,5 +1,5 @@
 {
-  "cluster.delete_repository": {
+  "snapshot.delete_repository": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html",
     "methods": ["DELETE"],
     "url": {
diff --git a/rest-api-spec/api/cluster.get_snapshot.json b/rest-api-spec/api/snapshot.get.json
similarity index 96%
rename from rest-api-spec/api/cluster.get_snapshot.json
rename to rest-api-spec/api/snapshot.get.json
index e73b2037c07..b440071df6f 100644
--- a/rest-api-spec/api/cluster.get_snapshot.json
+++ b/rest-api-spec/api/snapshot.get.json
@@ -1,5 +1,5 @@
 {
-  "cluster.get_snapshot": {
+  "snapshot.get": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html",
     "methods": ["GET"],
     "url": {
diff --git a/rest-api-spec/api/cluster.get_repository.json b/rest-api-spec/api/snapshot.get_repository.json
similarity index 95%
rename from rest-api-spec/api/cluster.get_repository.json
rename to rest-api-spec/api/snapshot.get_repository.json
index 04ce349f612..ba8a9fd2df9 100644
--- a/rest-api-spec/api/cluster.get_repository.json
+++ b/rest-api-spec/api/snapshot.get_repository.json
@@ -1,5 +1,5 @@
 {
-  "cluster.get_repository": {
+  "snapshot.get_repository": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html",
     "methods": ["GET"],
     "url": {
diff --git a/rest-api-spec/api/cluster.restore_snapshot.json b/rest-api-spec/api/snapshot.restore.json
similarity index 96%
rename from rest-api-spec/api/cluster.restore_snapshot.json
rename to rest-api-spec/api/snapshot.restore.json
index 3ec4d8edb0a..a51f66a8120 100644
--- a/rest-api-spec/api/cluster.restore_snapshot.json
+++ b/rest-api-spec/api/snapshot.restore.json
@@ -1,5 +1,5 @@
 {
-  "cluster.restore_snapshot": {
+  "snapshot.restore": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html",
     "methods": ["POST"],
     "url": {
diff --git a/rest-api-spec/test/cluster.node_info/10_basic.yaml b/rest-api-spec/test/nodes.info/10_basic.yaml
similarity index 73%
rename from rest-api-spec/test/cluster.node_info/10_basic.yaml
rename to rest-api-spec/test/nodes.info/10_basic.yaml
index bdd0b606f3d..cf632c5b198 100644
--- a/rest-api-spec/test/cluster.node_info/10_basic.yaml
+++ b/rest-api-spec/test/nodes.info/10_basic.yaml
@@ -1,7 +1,7 @@
 ---
 "node_info test":
   - do:
-      cluster.node_info: {}
+      nodes.info: {}
 
   - is_true: nodes
   - is_true: cluster_name
diff --git a/rest-api-spec/test/cluster.node_stats/10_basic.yaml b/rest-api-spec/test/nodes.stats/10_basic.yaml
similarity index 81%
rename from rest-api-spec/test/cluster.node_stats/10_basic.yaml
rename to rest-api-spec/test/nodes.stats/10_basic.yaml
index df1c33efa23..977d002748a 100644
--- a/rest-api-spec/test/cluster.node_stats/10_basic.yaml
+++ b/rest-api-spec/test/nodes.stats/10_basic.yaml
@@ -1,7 +1,7 @@
 ---
 "Nodes stats":
   - do:
-      cluster.node_stats:
+      nodes.stats:
         metric: [ indices, transport ]
 
   - is_true: cluster_name