diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-05-25 11:04:44 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-25 11:04:44 +0200 |
commit | 80f46f8c8a65491d1a688397bee7a1e402174cfd (patch) | |
tree | 6a046c845862c520d7c810dc4301b87d4e0ca003 /node-repository/src/main | |
parent | 5d0663a1f2eddb94b01d6ef09ea5cb8d149d4ab0 (diff) |
Send non-speed-adjusted cpu core count in rest API
Diffstat (limited to 'node-repository/src/main')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java index e3edf394da6..3fd3ae6ff26 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java @@ -130,6 +130,7 @@ class NodesResponse extends HttpResponse { toSlime(node, true, object); } + @SuppressWarnings("deprecation") private void toSlime(Node node, boolean allFields, Cursor object) { object.setString("url", nodeParentUrl + node.hostname()); if ( ! allFields) return; @@ -145,7 +146,7 @@ class NodesResponse extends HttpResponse { object.setString("flavor", node.flavor().name()); node.reservedTo().ifPresent(reservedTo -> object.setString("reservedTo", reservedTo.value())); if (node.flavor().isConfigured()) - object.setDouble("cpuCores", node.flavor().resources().vcpu()); + object.setDouble("cpuCores", node.flavor().getMinCpuCores()); NodeResourcesSerializer.toSlime(node.flavor().resources(), object.setObject("resources")); if (node.flavor().cost() > 0) object.setLong("cost", node.flavor().cost()); |