summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-23 21:33:35 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-23 21:33:35 +0100
commit9de2bc59518b3eae33fcde259af348e93910df7b (patch)
tree17da85a66cfb6cfebb95d73d95d08854513ff306 /node-repository
parentfd89173ecc6ea1a196a86ee4c43852bcda31fe6a (diff)
Allow patching to unreserve
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
index 503e25b46b6..09cb5dad0a9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
@@ -161,14 +161,11 @@ public class NodePatcher {
case "bandwidthGbps":
return node.with(node.flavor().with(node.flavor().resources().withBandwidthGbps(value.asDouble())));
case "modelName":
- if (value.type() == Type.NIX) {
- return node.withoutModelName();
- }
- return node.withModelName(asString(value));
+ return value.type() == Type.NIX ? node.withoutModelName() : node.withModelName(asString(value));
case "requiredDiskSpeed":
return patchRequiredDiskSpeed(asString(value));
case "reservedTo":
- return node.withReservedTo(TenantName.from(value.asString()));
+ return value.type() == Type.NIX ? node.withoutReservedTo() : node.withReservedTo(TenantName.from(value.asString()));
default :
throw new IllegalArgumentException("Could not apply field '" + name + "' on a node: No such modifiable field");
}