summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorValerij Fredriksen <valerij92@gmail.com>2021-02-19 17:03:42 +0100
committerValerij Fredriksen <valerij92@gmail.com>2021-02-19 17:08:45 +0100
commitcfa70b45dc89d009a925072c9238835e89f57630 (patch)
tree4706252060a6f661e60e109e7901c68b291b9650 /controller-server
parent4c365fc7bcb0cb4000cd247bcc2bb5109c0d0708 (diff)
Only divide by 3 in non-public zones
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 0128f7617f9..d435ad2da77 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -2001,7 +2001,10 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
object.setLong("nodes", resources.nodes());
object.setLong("groups", resources.groups());
toSlime(resources.nodeResources(), object.setObject("nodeResources"));
- object.setDouble("cost", Math.round(resources.nodes() * resources.nodeResources().cost() * 100.0 / 3.0) / 100.0);
+
+ // Divide cost by 3 in non-public zones to show approx. AWS equivalent cost
+ double costDivisor = controller.zoneRegistry().system().isPublic() ? 1.0 : 3.0;
+ object.setDouble("cost", Math.round(resources.nodes() * resources.nodeResources().cost() * 100.0 / costDivisor) / 100.0);
}
private void utilizationToSlime(Cluster.Utilization utilization, Cursor utilizationObject) {