Merge branch 'master' into bjormel/aws-main-controller

4 files changed, 43 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 5c6e5c9542a..dfa0d4dccf2 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
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.hosted.controller.api.integration.billing;
 
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -109,6 +110,9 @@ public interface BillingController {
     /** Get all bills from the system */
     List<Bill> getBills();
 
+    /** Get the bill with the given id */
+    Bill getBill(Bill.Id billId);
+
     /** Get the bill collection method for the given tenant */
     default CollectionMethod getCollectionMethod(TenantName tenant) {
         return CollectionMethod.NONE;
@@ -125,4 +129,8 @@ public interface BillingController {
     }
 
     default void updateCache(List<TenantName> tenants) {}
-}
\ No newline at end of file
+
+    default String exportBill(Bill bill, String exportMethod, CloudTenant tenant) {
+        return "NOT_IMPLEMENTED";
+    }
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporter.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporter.java
index a4b3abf3bf9..719d22429b8 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporter.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporter.java
@@ -1,5 +1,8 @@
 package com.yahoo.vespa.hosted.controller.api.integration.billing;
 
+import com.yahoo.vespa.hosted.controller.tenant.BillingReference;
+import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
+
 public interface BillingReporter {
-    double maintain();
+    BillingReference maintainTenant(CloudTenant tenant);
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporterMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporterMock.java
new file mode 100644
index 00000000000..34599f83a8c
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporterMock.java
@@ -0,0 +1,21 @@
+// Copyright Yahoo. 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.vespa.hosted.controller.tenant.BillingReference;
+import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
+
+import java.time.Clock;
+import java.util.UUID;
+
+public class BillingReporterMock implements BillingReporter {
+    private final Clock clock;
+
+    public BillingReporterMock(Clock clock) {
+        this.clock = clock;
+    }
+
+    @Override
+    public BillingReference maintainTenant(CloudTenant tenant) {
+        return new BillingReference(UUID.randomUUID().toString(), clock.instant());
+    }
+}
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 671739bacab..eb20126304e 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
@@ -171,6 +171,15 @@ public class MockBillingController implements BillingController {
     }
 
     @Override
+    public Bill getBill(Bill.Id billId) {
+        return committedBills.values().stream()
+                .flatMap(Collection::stream)
+                .filter(bill -> bill.id().equals(billId))
+                .findFirst()
+                .orElseThrow();
+    }
+
+    @Override
     public CollectionMethod getCollectionMethod(TenantName tenant) {
         return collectionMethod.getOrDefault(tenant, CollectionMethod.AUTO);
     }