aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api/src
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@verizonmedia.com>2020-11-13 15:43:12 +0100
committerGitHub <noreply@github.com>2020-11-13 15:43:12 +0100
commit109dfdcf24102774362b985f8732f997969e5436 (patch)
treeaaf0438f163140031c9c1a6fa5fa94a65c50d0e5 /controller-api/src
parentb4ae98c5166d7eb43368d1558c21c42e557cc050 (diff)
add instance, plan and planName to api response (#15338)
* add instance, plan and planName to api response * use PlanId class in BillingController API
Diffstat (limited to 'controller-api/src')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java2
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java5
2 files changed, 7 insertions, 0 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 ce03dccc86b..90c4622d803 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
@@ -16,6 +16,8 @@ public interface BillingController {
PlanId getPlan(TenantName tenant);
+ String getPlanDisplayName(PlanId planId);
+
Quota getQuota(TenantName tenant);
/**
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 b84c3083f41..420b964d7aa 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,6 +32,11 @@ public class MockBillingController implements BillingController {
}
@Override
+ public String getPlanDisplayName(PlanId planId) {
+ return "Plan with id: " + planId.value();
+ }
+
+ @Override
public Quota getQuota(TenantName tenant) {
return Quota.unlimited().withMaxClusterSize(5);
}