diff options
author | andreer <andreer@verizonmedia.com> | 2020-10-22 11:51:11 +0200 |
---|---|---|
committer | andreer <andreer@verizonmedia.com> | 2020-10-22 12:35:42 +0200 |
commit | 90aff3a99045f5fc35aff5069a723d0bdc3a54c7 (patch) | |
tree | a705eaf3c5442a196a708609e75afd1bc1eab010 /controller-api/src/main/java | |
parent | f28d70669348831c86756a1b570e57605e9823d8 (diff) |
sum usage across tenant, not application
Diffstat (limited to 'controller-api/src/main/java')
3 files changed, 6 insertions, 6 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java index 2283bdce885..78f8197062c 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java @@ -31,7 +31,7 @@ public class DeploymentData { private final Optional<DockerImage> dockerImageRepo; private final Optional<AthenzDomain> athenzDomain; private final Optional<ApplicationRoles> applicationRoles; - private final Optional<Quota> quota; + private final Quota quota; public DeploymentData(ApplicationId instance, ZoneId zone, byte[] applicationPackage, Version platform, Set<ContainerEndpoint> containerEndpoints, @@ -39,7 +39,7 @@ public class DeploymentData { Optional<DockerImage> dockerImageRepo, Optional<AthenzDomain> athenzDomain, Optional<ApplicationRoles> applicationRoles, - Optional<Quota> quota) { + Quota quota) { this.instance = requireNonNull(instance); this.zone = requireNonNull(zone); this.applicationPackage = requireNonNull(applicationPackage); @@ -88,7 +88,7 @@ public class DeploymentData { return applicationRoles; } - public Optional<Quota> quota() { + public Quota quota() { return quota; } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java index 6b8b3a7e8b5..24fb05a134a 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java @@ -17,7 +17,7 @@ public interface BillingController { PlanId getPlan(TenantName tenant); - Optional<Quota> getQuota(TenantName tenant, Environment environment); + Quota getQuota(TenantName tenant, Environment environment); /** * @return String containing error message if something went wrong. Empty otherwise diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java index 19dfe0d9dcc..38bb790c814 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java @@ -32,8 +32,8 @@ public class MockBillingController implements BillingController { } @Override - public Optional<Quota> getQuota(TenantName tenant, Environment environment) { - return Optional.of(Quota.unlimited().withMaxClusterSize(5)); + public Quota getQuota(TenantName tenant, Environment environment) { + return Quota.unlimited().withMaxClusterSize(5); } @Override |