diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-11-18 15:40:48 +0100 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-11-18 15:40:48 +0100 |
| commit | 47248d18e2b2259d0f81198f868db25526663c30 (patch) | |
| tree | 63878f167747a63a9e169f65f600cfd68556a598 /controller-server | |
| parent | 977e935102e7bd2c0bb0c8a8ab5278589e0c9a63 (diff) | |
ADd collection method to all tenants view
Diffstat (limited to 'controller-server')
2 files changed, 8 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java index 34601240c7f..199eee6d0c9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java @@ -179,6 +179,7 @@ public class BillingApiHandler extends LoggingRequestHandler { var tc = tenants.addObject(); tc.setString("tenant", tenant.value()); getPlanForTenant(tc, tenant); + getCollectionForTenant(tc, tenant); renderCurrentUsage(tc.setObject("current"), invoice); renderAdditionalItems(tc.setObject("additional").setArray("items"), billingController.getUnusedLineItems(tenant)); @@ -193,6 +194,11 @@ public class BillingApiHandler extends LoggingRequestHandler { } } + private void getCollectionForTenant(Cursor tc, TenantName tenant) { + var collection = billingController.getCollectionMethod(tenant); + tc.setString("collection", collection.name()); + } + private HttpResponse addLineItem(HttpRequest request, String tenant) { Inspector inspector = inspectorOrThrow(request); billingController.addLineItem( diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants index b222f6fbbd3..81868a44e57 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants @@ -5,6 +5,7 @@ "tenant":"tenant2", "plan":"some-plan", "planName":"Plan with id: some-plan", + "collection": "AUTO", "current":{ "amount":"123.00", "status":"accrued", @@ -25,6 +26,7 @@ "tenant":"tenant1", "plan":"some-plan", "planName":"Plan with id: some-plan", + "collection": "AUTO", "current":{ "amount":"123.00", "status":"accrued", |