aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@yahooinc.com>2022-05-03 16:04:34 +0200
committerØyvind Grønnesby <oyving@yahooinc.com>2022-05-03 16:04:34 +0200
commit9d693d1113a8400efac1a773faf9130a27aad1bd (patch)
tree2268ae361845e272fb75bf3db8eff73d71ff36cb /controller-api
parent5d6d8bad4b293ff99e6bb213fad1833555310ad1 (diff)
Allow hostedAccountant to bypass some checks
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java3
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java2
2 files changed, 3 insertions, 2 deletions
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 0ef76f498fb..40bc9b27449 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
@@ -48,9 +48,10 @@ public interface BillingController {
* @param tenant The name of the tenant.
* @param planId The ID of the plan to change to.
* @param hasDeployments Does the tenant have active deployments.
+ * @param isAccountant Is it the hosted accountant that is doing the operation
* @return String containing error message if something went wrong. Empty otherwise
*/
- PlanResult setPlan(TenantName tenant, PlanId planId, boolean hasDeployments);
+ PlanResult setPlan(TenantName tenant, PlanId planId, boolean hasDeployments, boolean isAccountant);
/**
* Create a bill of unbilled use for the given tenant in the given time period.
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 d6aa434ece4..44dd3a293c5 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
@@ -56,7 +56,7 @@ public class MockBillingController implements BillingController {
}
@Override
- public PlanResult setPlan(TenantName tenant, PlanId planId, boolean hasDeployments) {
+ public PlanResult setPlan(TenantName tenant, PlanId planId, boolean hasDeployments, boolean isAccountant) {
plans.put(tenant, planId);
return PlanResult.success();
}