diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-11-09 11:29:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 11:29:00 +0100 |
| commit | dc50de961734b229cd4bcb0fb6e515d94df82202 (patch) | |
| tree | 0651a44adca0dbb251e5b6e12ff1f97382e3525a /controller-server | |
| parent | 90b384a0288242fc818392843455ebf28f593066 (diff) | |
Bound the test quota to the tenant quota (#15226)
* Bound the test quota to the tenant quota
* Update tests for quota limit
Diffstat (limited to 'controller-server')
2 files changed, 5 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculator.java index cf135fc6b6e..de57f1a5676 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculator.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculator.java @@ -26,7 +26,7 @@ public class DeploymentQuotaCalculator { DeploymentSpec deploymentSpec) { if (tenantQuota.budget().isEmpty()) return tenantQuota; // Shortcut if there is no budget limit to care about. - if (deployingZone.environment().isTest()) return Quota.unlimited(); + if (deployingZone.environment().isTest()) return tenantQuota; if (deployingZone.environment().isProduction()) return probablyEnoughForAll(tenantQuota, tenantApps, deployingApp, deploymentSpec); return getMaximumAllowedQuota(tenantQuota, tenantApps, deployingApp, deployingZone); } 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 98710ce9b26..4099de32e00 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 @@ -64,8 +64,9 @@ public class DeploymentQuotaCalculatorTest { } @Test - public void unlimited_quota_in_pipeline() { - Quota calculated = DeploymentQuotaCalculator.calculate(Quota.zero(), List.of(), ApplicationId.defaultId(), ZoneId.from("test", "apac1"), DeploymentSpec.empty); - assertEquals(Quota.unlimited(), calculated); + public void tenant_quota_in_pipeline() { + var tenantQuota = Quota.unlimited().withBudget(42); + var calculated = DeploymentQuotaCalculator.calculate(tenantQuota, List.of(), ApplicationId.defaultId(), ZoneId.from("test", "apac1"), DeploymentSpec.empty); + assertEquals(tenantQuota, calculated); } }
\ No newline at end of file |