diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-06-27 13:50:07 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2023-06-27 14:31:46 +0200 |
| commit | 141299e3000bd690583e7601c2c119ce92c68638 (patch) | |
| tree | 44d70783aabb926927bf09bc8f5b706e7b84ab4a /node-repository | |
| parent | 40b1c68fa4492aec7c394f13b9a74530d4a1fe93 (diff) | |
Allow patching wantToUpgradeFlavor
Diffstat (limited to 'node-repository')
3 files changed, 3 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java index 407961dc054..32bba9336a2 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java @@ -223,6 +223,7 @@ public class NodePatcher { case WANT_TO_RETIRE: case WANT_TO_DEPROVISION: case WANT_TO_REBUILD: + case WANT_TO_UPGRADE_FLAVOR: // These needs to be handled as one, because certain combinations are not allowed. return node.withWantToRetire(asOptionalBoolean(root.field(WANT_TO_RETIRE)) .orElseGet(node.status()::wantToRetire), 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 0ef80cbe6f5..53b1a3bcb89 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 @@ -196,7 +196,7 @@ public class NodesV2ApiTest { Utf8.toBytes("{\"ipAddresses\": [\"127.0.0.1\",\"::1\"]}"), Request.Method.PATCH), "{\"message\":\"Updated host4.yahoo.com\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", - Utf8.toBytes("{\"wantToRetire\": true}"), Request.Method.PATCH), + Utf8.toBytes("{\"wantToRetire\": true, \"wantToUpgradeFlavor\": true}"), Request.Method.PATCH), "{\"message\":\"Updated host4.yahoo.com\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", Utf8.toBytes("{\"currentVespaVersion\": \"6.43.0\",\"currentDockerImage\": \"docker-registry.domain.tld:8080/dist/vespa:6.45.0\"}"), Request.Method.PATCH), diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json index 8adb6eeb20c..a3589e760ad 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json @@ -62,7 +62,7 @@ "preferToRetire": false, "wantToDeprovision": false, "wantToRebuild": false, - "wantToUpgradeFlavor": false, + "wantToUpgradeFlavor": true, "down": false, "history": [ { |