diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-03-15 15:48:48 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-03-15 15:48:48 +0100 |
| commit | f6af48a240ce1a030a8f50141f4bdd117d9ece20 (patch) | |
| tree | 2cf8623c1ddf25706f9082c9db62bd57ef051169 /node-repository/src/test/java/com/yahoo | |
| parent | 28791aaf2d574a903144334a1637fdf5c36d6bd2 (diff) | |
Set wantToDeprovision recursively
When requesting deprovisioning of a host we always want its children to lose
their allocation (via parked), so that the host can be deprovisioned.
Diffstat (limited to 'node-repository/src/test/java/com/yahoo')
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java | 5 | ||||
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java index 72788d5cdab..3047661e62b 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java @@ -244,7 +244,10 @@ public class OsVersionsTest { } private NodeList retiringChildrenOf(Node parent) { - return tester.nodeRepository().nodes().list().childrenOf(parent).matching(child -> child.status().wantToRetire()); + return tester.nodeRepository().nodes().list() + .childrenOf(parent) + .matching(child -> child.status().wantToRetire() && + child.status().wantToDeprovision()); } private List<Node> provisionInfraApplication(int nodeCount) { 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 6b4a57310e7..598692ad598 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 @@ -207,12 +207,6 @@ public class NodesV2ApiTest { Utf8.toBytes("{\"wantToRetire\": true}"), Request.Method.PATCH), "{\"message\":\"Updated dockerhost1.yahoo.com\"}"); - // wantToDeprovision on non-hosts is not allowed - tester.assertResponse(new Request("http://localhost:8080/nodes/v2/node/host5.yahoo.com", - Utf8.toBytes("{\"wantToDeprovision\": true, \"wantToRetire\": true}"), Request.Method.PATCH), - 400, - "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not set field 'wantToDeprovision': wantToDeprovision can only be set for hosts\"}"); - assertResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com", Utf8.toBytes("{\"wantToDeprovision\": true}"), Request.Method.PATCH), "{\"message\":\"Updated dockerhost1.yahoo.com\"}"); |