diff options
| author | valerijf <valerijf@oath.com> | 2017-08-22 11:07:38 +0200 |
|---|---|---|
| committer | valerijf <valerijf@oath.com> | 2017-08-22 11:07:38 +0200 |
| commit | 6da356d42a86f35719b45216c8b88ad853be6508 (patch) | |
| tree | 29c1492fa00ea942a506f8e71652aa468e5a384c /node-repository | |
| parent | 08c2a0490261a4666b65882616756ecfbe1c8c9b (diff) | |
Make node spec non-optional
Diffstat (limited to 'node-repository')
3 files changed, 7 insertions, 7 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 25e03cefe16..a7efc3ccd82 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 @@ -138,14 +138,11 @@ class NodesResponse extends HttpResponse { object.setString("openStackId", node.openStackId()); object.setString("flavor", node.flavor().name()); object.setString("canonicalFlavor", node.flavor().canonicalName()); - if (node.flavor().getMinDiskAvailableGb() > 0) - object.setDouble("minDiskAvailableGb", node.flavor().getMinDiskAvailableGb()); - if (node.flavor().getMinMainMemoryAvailableGb() > 0) - object.setDouble("minMainMemoryAvailableGb", node.flavor().getMinMainMemoryAvailableGb()); + object.setDouble("minDiskAvailableGb", node.flavor().getMinDiskAvailableGb()); + object.setDouble("minMainMemoryAvailableGb", node.flavor().getMinMainMemoryAvailableGb()); if (node.flavor().getDescription() != null && ! node.flavor().getDescription().isEmpty()) object.setString("description", node.flavor().getDescription()); - if (node.flavor().getMinCpuCores() > 0) - object.setDouble("minCpuCores", node.flavor().getMinCpuCores()); + object.setDouble("minCpuCores", node.flavor().getMinCpuCores()); if (node.flavor().cost() > 0) object.setLong("cost", node.flavor().cost()); object.setBool("fastDisk", node.flavor().hasFastDisk()); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java index c9af669ca8e..241a797cd1b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java @@ -25,7 +25,7 @@ public class MockNodeFlavors extends NodeFlavors { b.addFlavor("v-4-8-100", 4.0, 8.0, 100, Flavor.Type.VIRTUAL_MACHINE); FlavorsConfig.Flavor.Builder largeVariant = b.addFlavor("large-variant", 64, 128, 2000, Flavor.Type.BARE_METAL); b.addReplaces("large", largeVariant); - FlavorsConfig.Flavor.Builder expensiveFlavor = b.addFlavor("expensive", 0, 0, 0, Flavor.Type.BARE_METAL); + FlavorsConfig.Flavor.Builder expensiveFlavor = b.addFlavor("expensive", 6, 12, 500, Flavor.Type.BARE_METAL); b.addReplaces("default", expensiveFlavor); b.addCost(200, expensiveFlavor); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json index 7782cf15e50..4b7af75ee3c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json @@ -7,7 +7,10 @@ "openStackId": "node3", "flavor": "expensive", "canonicalFlavor": "default", + "minDiskAvailableGb": 500.0, + "minMainMemoryAvailableGb": 12.0, "description": "Flavor-name-is-expensive", + "minCpuCores": 6.0, "cost": 200, "fastDisk": true, "environment": "BARE_METAL", |