diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-03-19 18:08:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 18:08:51 +0100 |
| commit | e734680099b9482d4acc187a89fa59a0c0faa8d9 (patch) | |
| tree | cd1b7862b305c8a52add8c8ef4a183102b1048aa /node-repository | |
| parent | a681535b066cfc7c08d54603b811da8e0472736d (diff) | |
Update node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
Co-Authored-By: Valerij Fredriksen <freva@users.noreply.github.com>
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java index 6b308a96274..248cfbec662 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java @@ -157,10 +157,9 @@ class NodesResponse extends HttpResponse { toSlime(allocation.membership(), object.setObject("membership")); object.setLong("restartGeneration", allocation.restartGeneration().wanted()); object.setLong("currentRestartGeneration", allocation.restartGeneration().current()); - String wantedVespaVersion = allocation.membership().cluster().vespaVersion().toFullString(); object.setString("wantedDockerImage", allocation.membership().cluster().dockerImage() - .orElse(nodeRepository.dockerImage(node).withTag(allocation.membership().cluster().vespaVersion()).asString())); - object.setString("wantedVespaVersion", wantedVespaVersion); + .orElseGet(() -> nodeRepository.dockerImage(node).withTag(allocation.membership().cluster().vespaVersion()).asString())); + object.setString("wantedVespaVersion", allocation.membership().cluster().vespaVersion().toFullString()); toSlime(allocation.requestedResources(), object.setObject("requestedResources")); allocation.networkPorts().ifPresent(ports -> NetworkPortsSerializer.toSlime(ports, object.setArray("networkPorts"))); orchestrator.apply(new HostName(node.hostname())) |