Support legacy bill status "CANCELED"

2 files changed, 6 insertions, 2 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillStatus.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillStatus.java
index a6ff3804b2a..4f35b47219a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillStatus.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillStatus.java
@@ -9,8 +9,10 @@ public enum BillStatus {
     CLOSED,     // End state for a valid bill.
     VOID;       // End state, indicating that the bill is not valid.
 
-    private static final String LEGACY_ISSUED = "ISSUED";         // Legacy state, used by historical bills
-    private static final String LEGACY_EXPORTED = "EXPORTED";     // Legacy state, used by historical bills
+    // Legacy states, used by historical bills
+    private static final String LEGACY_ISSUED = "ISSUED";
+    private static final String LEGACY_EXPORTED = "EXPORTED";
+    private static final String LEGACY_CANCELED = "CANCELED";
 
     private final String value;
 
@@ -24,6 +26,7 @@ public enum BillStatus {
 
     public static BillStatus from(String status) {
         if (LEGACY_ISSUED.equals(status) || LEGACY_EXPORTED.equals(status)) return OPEN;
+        if (LEGACY_CANCELED.equals(status)) return VOID;
         return Enum.valueOf(BillStatus.class, status.toUpperCase());
     }
 
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillStatusTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillStatusTest.java
index 9647a11a4ba..022474406b9 100644
--- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillStatusTest.java
+++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillStatusTest.java
@@ -13,6 +13,7 @@ public class BillStatusTest {
     void legacy_states_are_converted() {
         assertEquals(BillStatus.OPEN, BillStatus.from("ISSUED"));
         assertEquals(BillStatus.OPEN, BillStatus.from("EXPORTED"));
+        assertEquals(BillStatus.VOID, BillStatus.from("CANCELED"));
     }
 
 }