Expose create trial limit in user API

- Exposed the create trial tenant limit in the user API
- Changed the interface to the BillingController to be something that returns the
  tenants with a given plan instead of a full map tenant -> plan.

2 files changed, 5 insertions, 6 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 1bd1faf5dd1..3a864fc04c6 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,7 +16,7 @@ public interface BillingController {
 
     PlanId getPlan(TenantName tenant);
 
-    Map<TenantName, PlanId> getPlans(List<TenantName> tenants);
+    List<TenantName> tenantsWithPlan(List<TenantName> existing, PlanId planId);
 
     String getPlanDisplayName(PlanId planId);
 
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 3f241510ed6..b24d532d4a3 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
@@ -34,11 +34,10 @@ public class MockBillingController implements BillingController {
     }
 
     @Override
-    public Map<TenantName, PlanId> getPlans(List<TenantName> tenants) {
-        return tenants.stream().collect(Collectors.toMap(
-                (TenantName t) -> t,
-                (TenantName t) -> plans.getOrDefault(t, PlanId.from("trial"))
-        ));
+    public List<TenantName> tenantsWithPlan(List<TenantName> tenants, PlanId planId) {
+        return tenants.stream()
+                .filter(t -> plans.getOrDefault(t, PlanId.from("trial")).equals(planId))
+                .collect(Collectors.toList());
     }
 
     @Override