diff options
| author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-01-20 09:21:32 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-01-20 09:21:32 +0100 |
| commit | f3f5903bb55f6dfe948e2a227f6e465c31690396 (patch) | |
| tree | a9b1822a5321e1dda94415360dc73ac6f7142c74 /node-repository/src/test/java | |
| parent | 66523fc6cf67017b5144990cb07fcee0bad3eb10 (diff) | |
Move retired nodes to dirty if wantToDeprovision
Diffstat (limited to 'node-repository/src/test/java')
5 files changed, 8 insertions, 8 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json index a7a6a06ae0f..50ca2b1ca41 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json @@ -1,7 +1,7 @@ { "url": "http://localhost:8080/nodes/v2/node/host55.yahoo.com", "id": "node55", - "state": "parked", + "state": "dirty", "type": "tenant", "hostname": "host55.yahoo.com", "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local]", @@ -22,7 +22,7 @@ "agent": "system" }, { - "event": "parked", + "event": "deallocated", "at": 123, "agent": "system" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive-include-deprovisioned.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive-include-deprovisioned.json index 03df6c8e1dc..2b650bad39b 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive-include-deprovisioned.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive-include-deprovisioned.json @@ -17,8 +17,8 @@ @include(node2.json), @include(docker-node1.json), @include(node1.json), - @include(node5.json), @include(node55.json), + @include(node5.json), @include(dockerhost6.json) ] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive.json index 8835945dc92..55e216f454a 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive.json @@ -17,7 +17,7 @@ @include(node2.json), @include(docker-node1.json), @include(node1.json), - @include(node5.json), - @include(node55.json) + @include(node55.json), + @include(node5.json) ] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes.json index db4d0bb1682..54ff2bc232f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes.json @@ -52,10 +52,10 @@ "url": "http://localhost:8080/nodes/v2/node/host1.yahoo.com" }, { - "url": "http://localhost:8080/nodes/v2/node/host5.yahoo.com" + "url": "http://localhost:8080/nodes/v2/node/host55.yahoo.com" }, { - "url": "http://localhost:8080/nodes/v2/node/host55.yahoo.com" + "url": "http://localhost:8080/nodes/v2/node/host5.yahoo.com" } ] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/states-recursive.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/states-recursive.json index 68ff9fedc00..27767be6315 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/states-recursive.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/states-recursive.json @@ -45,6 +45,7 @@ "dirty": { "url": "http://localhost:8080/nodes/v2/state/dirty", "nodes": [ + @include(node55.json) ] }, "failed": { @@ -56,7 +57,6 @@ "parked": { "url": "http://localhost:8080/nodes/v2/state/parked", "nodes": [ - @include(node55.json) ] }, "deprovisioned": { |