From 9de2bc59518b3eae33fcde259af348e93910df7b Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 23 Jan 2020 21:33:35 +0100 Subject: Allow patching to unreserve --- .../com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'node-repository') 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"); } -- cgit v1.2.3