summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@verizonmedia.com>2020-08-27 10:44:20 +0200
committerGitHub <noreply@github.com>2020-08-27 10:44:20 +0200
commitd7ac78d9f38f69d0309a808e2d60e15fbc27d433 (patch)
treeb443078cb0d61e6fe86cb035115b39316b5b2149 /controller-api
parent35a8d53194a329e80abc52fa30d04c85a7ce96de (diff)
set quota to 0 outside dev system for trial plan (#14163)
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.java3
2 files changed, 4 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 c5b548b8e6c..6b8b3a7e8b5 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
@@ -1,6 +1,7 @@
// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.api.integration.billing;
+import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.TenantName;
import com.yahoo.vespa.hosted.controller.api.integration.user.User;
@@ -16,7 +17,7 @@ public interface BillingController {
PlanId getPlan(TenantName tenant);
- Optional<Quota> getQuota(TenantName tenant);
+ Optional<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 62d32b1e848..5db89ccc656 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
@@ -1,6 +1,7 @@
// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.api.integration.billing;
+import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.TenantName;
import com.yahoo.vespa.hosted.controller.api.integration.user.User;
@@ -31,7 +32,7 @@ public class MockBillingController implements BillingController {
}
@Override
- public Optional<Quota> getQuota(TenantName tenant) {
+ public Optional<Quota> getQuota(TenantName tenant, Environment environment) {
return Optional.of(new Quota(5));
}