Merge pull request #14607 from vespa-engine/bratseth/adjust-prices-take-2

Bratseth/adjust prices take 2

5 files changed, 16 insertions, 9 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java
index cb600bc0a5e..d108b160829 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java
@@ -14,7 +14,10 @@ import java.util.Optional;
  * @author ogronnesby
  */
 public class Quota {
+
     private final Optional<Integer> maxClusterSize;
+
+    /** The max budget in dollars per hour */
     private final Optional<Integer> budget;
 
     public Quota(Optional<Integer> maybeClusterSize, Optional<Integer> budget) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
index 10199bfe6b9..3e42cbed9b1 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
@@ -42,7 +42,8 @@ public class QuotaValidatorTest {
             tester.deploy(null, getServices("testCluster", 10), Environment.prod, null);
             fail();
         } catch (RuntimeException e) {
-            assertEquals("Hourly spend for maximum specified resources ($1.60) exceeds budget from quota ($1.00)!", e.getMessage());
+            assertEquals("Hourly spend for maximum specified resources ($-.--) exceeds budget from quota ($-.--)!",
+                         ValidationTester.censorNumbers(e.getMessage()));
         }
     }
 
@@ -62,4 +63,6 @@ public class QuotaValidatorTest {
                 "   </content>" +
                 "</services>";
     }
+
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
index 6961ffa682b..2b3b1a9fcc7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
@@ -96,6 +96,8 @@ public class ValidationTester {
         return new Pair<>(newModel, newModelCreator.configChangeActions);
     }
 
-
+    public static String censorNumbers(String s) {
+        return s.replaceAll("\\d", "-");
+    }
 
 }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
index fad276379cc..22748d209e5 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
@@ -12,12 +12,11 @@ import java.util.Optional;
 public class NodeResources {
 
     // Standard unit cost in dollars per hour
-    private static final double cpuUnitCost =    0.12;
-    private static final double memoryUnitCost = 0.012;
-    private static final double diskUnitCost =   0.0004;
+    private static final double cpuUnitCost =    0.09;
+    private static final double memoryUnitCost = 0.009;
+    private static final double diskUnitCost =   0.00013;
 
-    // TODO: Remove when models older than 7.226 are gone
-    public static final NodeResources unspecified = new NodeResources(0, 0, 0, 0);
+    private static final NodeResources unspecified = new NodeResources(0, 0, 0, 0);
 
     public enum DiskSpeed {
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
index 00d1cd84e4c..e36de88940b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
@@ -51,7 +51,7 @@ public class AutoscalingTest {
 
         tester.addMeasurements(Resource.cpu, 0.25f, 1f, 60, application1);
         ClusterResources scaledResources = tester.assertResources("Scaling up since resource usage is too high",
-                                                                  15, 1, 1.3,  28.6, 28.6,
+                                                                  14, 1, 1.3,  30.8, 30.8,
                                                                   tester.autoscale(application1, cluster1.id(), min, max));
 
         tester.deploy(application1, cluster1, scaledResources);
@@ -119,7 +119,7 @@ public class AutoscalingTest {
         ClusterResources max = new ClusterResources(20, 1,
                                                     new NodeResources(100, 1000, 1000, 1, NodeResources.DiskSpeed.any));
         ClusterResources scaledResources = tester.assertResources("Scaling up since resource usage is too high",
-                                                                  15, 1, 1.3,  28.6, 28.6,
+                                                                  14, 1, 1.3,  30.8, 30.8,
                                                                   tester.autoscale(application1, cluster1.id(), min, max));
         assertEquals("Disk speed from min/max is used",
                      NodeResources.DiskSpeed.any, scaledResources.nodeResources().diskSpeed());