diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-03-08 10:59:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 10:59:50 +0100 |
| commit | 7882c0d2fba97670409865a13a49d054f7b4514f (patch) | |
| tree | 757dbfda2d43e73187381f8ae9110f14f0f3475c /node-repository | |
| parent | c765db15564b591377b3ff4c5386cf362a1f7c94 (diff) | |
| parent | caeaed13ae4699932e70f757197ea3c1414bcfc6 (diff) | |
Merge pull request #5237 from vespa-engine/jvenstad/add-description-to-node-types
Add descriptive name to each node type
Diffstat (limited to 'node-repository')
3 files changed, 12 insertions, 12 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java index 9a0856f5afa..d17f5d70b06 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java @@ -178,9 +178,9 @@ public class RestApiTest { "{\"message\":\"Moved dockerhost1.yahoo.com, host4.yahoo.com to failed\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/state/failed"), "{\"nodes\":[" + - "{\"url\":\"http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com\"}," + "{\"url\":\"http://localhost:8080/nodes/v2/node/host5.yahoo.com\"}," + - "{\"url\":\"http://localhost:8080/nodes/v2/node/host4.yahoo.com\"}]}"); + "{\"url\":\"http://localhost:8080/nodes/v2/node/host4.yahoo.com\"}," + + "{\"url\":\"http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com\"}]}"); // Update (PATCH) a node (multiple fields can also be sent in one request body) assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/active-nodes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/active-nodes.json index c67ba904f9a..9c462bb5520 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/active-nodes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/active-nodes.json @@ -1,13 +1,13 @@ { "nodes": [ + @include(node6.json), + @include(node2.json), + @include(docker-container1.json), + @include(node4.json), @include(docker-node4.json), @include(docker-node5.json), @include(docker-node2.json), @include(docker-node1.json), - @include(docker-node3.json), - @include(node6.json), - @include(node2.json), - @include(docker-container1.json), - @include(node4.json) + @include(docker-node3.json) ] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/states-recursive.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/states-recursive.json index 183f81ee3e1..628ab53e9f0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/states-recursive.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/states-recursive.json @@ -22,15 +22,15 @@ "active": { "url": "http://localhost:8080/nodes/v2/state/active", "nodes": [ + @include(node6.json), + @include(node2.json), + @include(docker-container1.json), + @include(node4.json), @include(docker-node4.json), @include(docker-node5.json), @include(docker-node2.json), @include(docker-node1.json), - @include(docker-node3.json), - @include(node6.json), - @include(node2.json), - @include(docker-container1.json), - @include(node4.json) + @include(docker-node3.json) ] }, "inactive": { |