diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-11-26 11:32:41 +0100 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-11-26 11:32:41 +0100 |
| commit | a05617af4d2498460ff18ca60b471a35dd557c1a (patch) | |
| tree | 98b8d8c4da06fdc99b7d0596356c4a0d67109022 /controller-server | |
| parent | b07d83f7c04ce8774e91f8202fffdecf21adac1d (diff) | |
Expose "additional" line items in CSV export
Diffstat (limited to 'controller-server')
2 files changed, 5 insertions, 4 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 367f8e728bf..cedae5b5a46 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 @@ -112,7 +112,7 @@ public class BillingApiHandler extends LoggingRequestHandler { private HttpResponse getAllInvoices() { var invoices = billingController.getInvoices(); - var headers = new String[]{ "ID", "Tenant", "From", "To", "CpuHours", "MemoryHours", "DiskHours", "Cpu", "Memory", "Disk" }; + var headers = new String[]{ "ID", "Tenant", "From", "To", "CpuHours", "MemoryHours", "DiskHours", "Cpu", "Memory", "Disk", "Additional" }; var rows = invoices.stream() .map(invoice -> { return new Object[] { @@ -120,7 +120,8 @@ public class BillingApiHandler extends LoggingRequestHandler { invoice.getStartTime().format(DateTimeFormatter.ISO_LOCAL_DATE), invoice.getEndTime().format(DateTimeFormatter.ISO_LOCAL_DATE), invoice.sumCpuHours(), invoice.sumMemoryHours(), invoice.sumDiskHours(), - invoice.sumCpuCost(), invoice.sumMemoryCost(), invoice.sumDiskCost() + invoice.sumCpuCost(), invoice.sumMemoryCost(), invoice.sumDiskCost(), + invoice.sumAdditionalCost() }; }) .collect(Collectors.toList()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-invoices b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-invoices index 157470106f4..957ed858951 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-invoices +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-invoices @@ -1,2 +1,2 @@ -ID,Tenant,From,To,CpuHours,MemoryHours,DiskHours,Cpu,Memory,Disk -id-1,default,2020-05-23,2020-05-28,0.00,0.00,0.00,0.00,0.00,0.00 +ID,Tenant,From,To,CpuHours,MemoryHours,DiskHours,Cpu,Memory,Disk,Additional +id-1,default,2020-05-23,2020-05-28,0.00,0.00,0.00,0.00,0.00,0.00,123.00 |