Add instrument address

2 files changed, 49 insertions, 5 deletions

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 523f20eaef8..f1fb25e6cea 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
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.api.integration.billing;
 
 import com.yahoo.config.provision.TenantName;
-import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -130,8 +129,13 @@ public class MockBillingController implements BillingController {
                 "brand",
                 "type",
                 "endingWith",
-                "expiryDate"
-        );
+                "expiryDate",
+                "addressLine1",
+                "addressLine2",
+                "zip",
+                "city",
+                "state",
+                "country");
     }
 
     public void addInvoice(TenantName tenantName, Invoice invoice, boolean committed) {
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PaymentInstrument.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PaymentInstrument.java
index 7b8d36f3d4f..cb0d988f45f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PaymentInstrument.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PaymentInstrument.java
@@ -13,9 +13,14 @@ public class PaymentInstrument {
     private final String type;
     private final String endingWith;
     private final String expiryDate;
+    private final String addressLine1;
+    private final String addressLine2;
+    private final String city;
+    private final String state;
+    private final String zip;
+    private final String country;
 
-
-    public PaymentInstrument(String id, String nameOnCard, String displayText, String brand, String type, String endingWith, String expiryDate) {
+    public PaymentInstrument(String id, String nameOnCard, String displayText, String brand, String type, String endingWith, String expiryDate, String addressLine1, String addressLine2, String zip, String city, String state, String country) {
         this.id = id;
         this.nameOnCard = nameOnCard;
         this.displayText = displayText;
@@ -23,6 +28,12 @@ public class PaymentInstrument {
         this.type = type;
         this.endingWith = endingWith;
         this.expiryDate = expiryDate;
+        this.addressLine1 = addressLine1;
+        this.addressLine2 = addressLine2;
+        this.zip = zip;
+        this.city = city;
+        this.state = state;
+        this.country = country;
     }
 
     public String getId() {
@@ -48,4 +59,33 @@ public class PaymentInstrument {
     public String getEndingWith() {
         return endingWith;
     }
+
+    public String getExpiryDate() {
+        return expiryDate;
+    }
+
+    public String getAddressLine1() {
+        return addressLine1;
+    }
+
+    public String getAddressLine2() {
+        return addressLine2;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
 }