diff options
15 files changed, 36 insertions, 36 deletions
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 16ab941d3be..8750d3caa47 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 @@ -21,7 +21,7 @@ public class QuotaValidatorTest { private final Zone publicZone = new Zone(SystemName.Public, Environment.prod, RegionName.from("foo")); private final Zone publicCdZone = new Zone(SystemName.PublicCd, Environment.prod, RegionName.from("foo")); - private final Quota quota = Quota.unlimited().withClusterSize(10).withBudget(BigDecimal.valueOf(1)); + private final Quota quota = Quota.unlimited().withClusterSize(10).withBudget(BigDecimal.valueOf(1.25)); @Test public void test_deploy_under_quota() { 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 21349910ca1..25771f1906b 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,9 +12,9 @@ import java.util.Optional; public class NodeResources { // Standard unit cost in dollars per hour - private static final double cpuUnitCost = 0.09; - private static final double memoryUnitCost = 0.009; - private static final double diskUnitCost = 0.0003; + private static final double cpuUnitCost = 0.11; + private static final double memoryUnitCost = 0.011; + private static final double diskUnitCost = 0.0004; private static final NodeResources zero = new NodeResources(0, 0, 0, 0); private static final NodeResources unspecified = new NodeResources(0, 0, 0, 0); diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java index e342a90c957..cbca931e4d0 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java @@ -14,7 +14,7 @@ public class ClusterResourcesTest { public void testCost() { ClusterResources r1 = new ClusterResources(3, 1, new NodeResources(2, 8, 50, 1)); ClusterResources r2 = new ClusterResources(3, 1, new NodeResources(2, 16, 50, 1)); - assertEquals(1.818, r1.cost() + r2.cost(), 0.01); + assertEquals(2.232, r1.cost() + r2.cost(), 0.01); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java index 96b0e3137cb..11b3ad0d45a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java @@ -101,7 +101,7 @@ public class DeploymentQuotaCalculatorTest { var mapper = new ObjectMapper(); var application = mapper.readValue(content, ApplicationData.class).toApplication(); var usage = DeploymentQuotaCalculator.calculateQuotaUsage(application); - assertEquals(1.068, usage.rate(), 0.001); + assertEquals(1.312, usage.rate(), 0.001); } @Test diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/QuotaUsageTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/QuotaUsageTest.java index 5ce6c95ee82..772d65fa80e 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/QuotaUsageTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/QuotaUsageTest.java @@ -15,7 +15,7 @@ public class QuotaUsageTest { public void testQuotaUsageIsPersisted() { var tester = new DeploymentTester(); var context = tester.newDeploymentContext().submit().deploy(); - assertEquals(1.062, context.deployment(ZoneId.from("prod.us-west-1")).quota().rate(), 0.01); + assertEquals(1.304, context.deployment(ZoneId.from("prod.us-west-1")).quota().rate(), 0.01); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java index 320938f00e4..a8d39438654 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java @@ -65,8 +65,8 @@ public class ResourceMeterMaintainerTest { new ResourceSnapshot(app1, 23, 45, 67, NodeResources.Architecture.getDefault(), Instant.EPOCH, z2), new ResourceSnapshot(app2, 34, 56, 78, NodeResources.Architecture.getDefault(), Instant.EPOCH, z1)); maintainer.updateDeploymentCost(resourceSnapshots); - assertCost.accept(app1, Map.of(z1, 1.40, z2, 2.50)); - assertCost.accept(app2, Map.of(z1, 3.59)); + assertCost.accept(app1, Map.of(z1, 1.72, z2, 3.05)); + assertCost.accept(app2, Map.of(z1, 4.39)); // Remove a region from app1 and add region to app2 resourceSnapshots = List.of( @@ -74,9 +74,9 @@ public class ResourceMeterMaintainerTest { new ResourceSnapshot(app2, 34, 56, 78, NodeResources.Architecture.getDefault(), Instant.EPOCH, z1), new ResourceSnapshot(app2, 45, 67, 89, NodeResources.Architecture.getDefault(), Instant.EPOCH, z2)); maintainer.updateDeploymentCost(resourceSnapshots); - assertCost.accept(app1, Map.of(z2, 2.50)); - assertCost.accept(app2, Map.of(z1, 3.59, z2, 4.68)); - assertEquals(1.4, + assertCost.accept(app1, Map.of(z2, 3.05)); + assertCost.accept(app2, Map.of(z1, 4.39, z2, 5.72)); + assertEquals(1.72, (Double) metrics.getMetric(context -> z1.value().equals(context.get("zoneId")) && app1.tenant().value().equals(context.get("tenant")), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json index d90e03a1439..3eff2ab781a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json @@ -13,7 +13,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 0.09 + "cost": 0.11 }, "max": { "nodes": 2, @@ -26,7 +26,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 0.35 + "cost": 0.43 }, "current": { "nodes": 2, @@ -39,7 +39,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 0.18 + "cost": 0.22 }, "target": { "nodes": 2, @@ -52,7 +52,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 0.24 + "cost": 0.29 }, "utilization": { "cpu": 0.1, @@ -91,7 +91,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 0.18 + "cost": 0.22 }, "at": 1234, "completion": 2234 diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json index 5268b7b56cb..4d0f1259c07 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json @@ -29,7 +29,7 @@ "commit": "commit1" }, "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { }, "metrics": { "queriesPerSecond": 0.0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-with-routing-policy.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-with-routing-policy.json index 7244cf1493a..b0a8ceeeff0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-with-routing-policy.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-with-routing-policy.json @@ -29,7 +29,7 @@ "commit": "commit1" }, "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { }, "metrics": { "queriesPerSecond": 0.0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-without-shared-endpoints.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-without-shared-endpoints.json index 7244cf1493a..b0a8ceeeff0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-without-shared-endpoints.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-without-shared-endpoints.json @@ -29,7 +29,7 @@ "commit": "commit1" }, "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { }, "metrics": { "queriesPerSecond": 0.0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json index 1448b79385b..37bd69d5863 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json @@ -54,7 +54,7 @@ "commit": "commit1" }, "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { "lastQueried": 1527848130000, "lastWritten": 1527848130000, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json index 4bd328f605f..d78ab67dcc5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json @@ -66,7 +66,7 @@ "deployTimeEpochMs": 1600000000000, "screwdriverId": "123", "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { "lastQueried": 1527848130000, "lastWritten": 1527848130000, @@ -141,7 +141,7 @@ "commit": "commit1" }, "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { "lastQueried": 1527848130000, "lastWritten": 1527848130000, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json index bfbeda9233d..8d76d54458d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json @@ -73,7 +73,7 @@ "deployTimeEpochMs": 1600000000000, "screwdriverId": "123", "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { "lastQueried": 1527848130000, "lastWritten": 1527848130000, @@ -148,7 +148,7 @@ "commit": "commit1" }, "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { "lastQueried": 1527848130000, "lastWritten": 1527848130000, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-recursive.json index 054aaec0fcd..b9bf714d362 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-recursive.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-recursive.json @@ -72,7 +72,7 @@ "deployTimeEpochMs": 1600000000000, "screwdriverId": "123", "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { "lastQueried": 1527848130000, "lastWritten": 1527848130000, @@ -147,7 +147,7 @@ "commit": "commit1" }, "status": "complete", - "quota": 1.062, + "quota": 1.304, "activity": { "lastQueried": 1527848130000, "lastWritten": 1527848130000, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepoStatsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepoStatsTest.java index 56f4863c881..62c96af7629 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepoStatsTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepoStatsTest.java @@ -105,21 +105,21 @@ public class NodeRepoStatsTest { var app3Stats = stats.applicationStats().get(1); assertEquals(app1, app1Stats.id()); - assertEquals(2.940, app1Stats.cost(), delta); - assertEquals(0.702, app1Stats.utilizedCost(), delta); - assertEquals(2.238, app1Stats.unutilizedCost(), delta); + assertEquals(3.6400, app1Stats.cost(), delta); + assertEquals(0.8676, app1Stats.utilizedCost(), delta); + assertEquals(2.7724, app1Stats.unutilizedCost(), delta); assertLoad(new Load(0.2571, 0.2314, 0.2057), app1Stats.load()); assertEquals(app2, app2Stats.id()); - assertEquals(1.680, app2Stats.cost(), delta); - assertEquals(0.624, app2Stats.utilizedCost(), delta); - assertEquals(1.056, app2Stats.unutilizedCost(), delta); + assertEquals(2.0799, app2Stats.cost(), delta); + assertEquals(0.7712, app2Stats.utilizedCost(), delta); + assertEquals(1.3087, app2Stats.unutilizedCost(), delta); assertLoad(new Load(.40, 0.36, 0.32), app2Stats.load()); assertEquals(app3, app3Stats.id()); - assertEquals(2.100, app3Stats.cost(), delta); - assertEquals(0.975, app3Stats.utilizedCost(), delta); - assertEquals(1.125, app3Stats.unutilizedCost(), delta); + assertEquals(2.6000, app3Stats.cost(), delta); + assertEquals(1.2049, app3Stats.utilizedCost(), delta); + assertEquals(1.3950, app3Stats.unutilizedCost(), delta); assertLoad(new Load(0.5, 0.45, 0.40), app3Stats.load()); } |