diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-11-21 10:08:36 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-11-21 10:08:36 +0100 |
| commit | 30a13ea72ceef98b8113d46992cd56478d279426 (patch) | |
| tree | 0e1a1b561757c3d57b7a36dac5ecb5fc998db356 /node-repository/src/test | |
| parent | 1b8a045f072ac5a359bd76e3d0670de98c813716 (diff) | |
Add test for GET enclave nodes non-recursive.
Diffstat (limited to 'node-repository/src/test')
3 files changed, 15 insertions, 4 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java index 51d676515d6..55b401ef4e8 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java @@ -60,7 +60,8 @@ public class NodesV2ApiTest { assertFile(new Request("http://localhost:8080/nodes/v2/node/"), "nodes.json"); assertFile(new Request("http://localhost:8080/nodes/v2/node/?recursive=true"), "nodes-recursive.json"); assertFile(new Request("http://localhost:8080/nodes/v2/node/?recursive=true&includeDeprovisioned=true"), "nodes-recursive-include-deprovisioned.json"); - assertFile(new Request("http://localhost:8080/nodes/v2/node/?recursive=true&enclave=true"), "enclave-nodes.json"); + assertFile(new Request("http://localhost:8080/nodes/v2/node/?enclave=true"), "enclave-nodes.json"); + assertFile(new Request("http://localhost:8080/nodes/v2/node/?recursive=true&enclave=true"), "enclave-nodes-recursive.json"); assertFile(new Request("http://localhost:8080/nodes/v2/node/host2.yahoo.com"), "node2.json"); assertFile(new Request("http://localhost:8080/nodes/v2/stats"), "stats.json"); assertFile(new Request("http://localhost:8080/nodes/v2/maintenance/"), "maintenance.json"); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/enclave-nodes-recursive.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/enclave-nodes-recursive.json new file mode 100644 index 00000000000..5c728d77920 --- /dev/null +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/enclave-nodes-recursive.json @@ -0,0 +1,6 @@ +{ + "nodes": [ + @include(node3.json), + @include(docker-node2.json) + ] +} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/enclave-nodes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/enclave-nodes.json index 5c728d77920..5bbc683c92a 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/enclave-nodes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/enclave-nodes.json @@ -1,6 +1,10 @@ { - "nodes": [ - @include(node3.json), - @include(docker-node2.json) + "nodes":[ + { + "url":"http://localhost:8080/nodes/v2/node/host3.yahoo.com" + }, + { + "url":"http://localhost:8080/nodes/v2/node/dockerhost2.yahoo.com" + } ] } |