Merge pull request #31241 from vespa-engine/hakonhall/quota-capacity-policies

Hakonhall/quota capacity policies

3 files changed, 8 insertions, 2 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ClusterInfoTest.java b/config-model/src/test/java/com/yahoo/vespa/model/ClusterInfoTest.java
index 4df9f261dfe..7aa6eb76995 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/ClusterInfoTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/ClusterInfoTest.java
@@ -258,7 +258,7 @@ public class ClusterInfoTest {
                                   .provisioned(provisioner.provisioned())
                                   .build();
         new VespaModel(new NullConfigModelRegistry(), deployState);
-        return deployState.provisioned().all();
+        return deployState.provisioned().capacities();
     }
 
 }
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 89f81dfdaef..590433757c3 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
@@ -54,6 +54,12 @@ public class QuotaValidatorTest {
     }
 
     @Test
+    void test_deploy_within_quota_budget_because_in_dev() {
+        var tester = new ValidationTester(13, false, new TestProperties().setHostedVespa(true).setQuota(quota).setZone(devZone));
+        tester.deploy(null, getServices(10), Environment.dev, null, CONTAINER_CLUSTER);
+    }
+
+    @Test
     void test_deploy_above_quota_budget_in_publiccd() {
         var tester = new ValidationTester(13, false, new TestProperties().setHostedVespa(true).setQuota(quota.withBudget(BigDecimal.ONE)).setZone(publicCdZone));
         try {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index e704da08d18..0e8ce4748b4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -598,7 +598,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
                                                 .setCloudAccount(cloudAccount))
                 .build());
         assertEquals(2, model.hostSystem().getHosts().size());
-        assertEquals(List.of(cloudAccount), model.provisioned().all().values()
+        assertEquals(List.of(cloudAccount), model.provisioned().capacities().values()
                                                  .stream()
                                                  .map(capacity -> capacity.cloudAccount().get())
                                                  .toList());