1 files changed, 19 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
index 239026249e5..f00e37e0ee8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
@@ -9,6 +9,7 @@ import com.yahoo.config.model.api.TenantSecretStore;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.CloudAccount;
+import com.yahoo.config.provision.DataplaneToken;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
@@ -20,6 +21,7 @@ import com.yahoo.vespa.config.server.TimeoutBudget;
 import com.yahoo.vespa.config.server.http.SessionHandler;
 import com.yahoo.vespa.config.server.tenant.CloudAccountSerializer;
 import com.yahoo.vespa.config.server.tenant.ContainerEndpointSerializer;
+import com.yahoo.vespa.config.server.tenant.DataplaneTokenSerializer;
 import com.yahoo.vespa.config.server.tenant.EndpointCertificateMetadataSerializer;
 import com.yahoo.vespa.config.server.tenant.TenantSecretStoreSerializer;
 
@@ -55,6 +57,7 @@ public final class PrepareParams {
     static final String WAIT_FOR_RESOURCES_IN_PREPARE = "waitForResourcesInPrepare";
     static final String OPERATOR_CERTIFICATES = "operatorCertificates";
     static final String CLOUD_ACCOUNT = "cloudAccount";
+    static final String DATAPLANE_TOKENS = "dataplaneTokens";
 
     private final ApplicationId applicationId;
     private final TimeoutBudget timeoutBudget;
@@ -73,6 +76,7 @@ public final class PrepareParams {
     private final List<TenantSecretStore> tenantSecretStores;
     private final List<X509Certificate> operatorCertificates;
     private final Optional<CloudAccount> cloudAccount;
+    private final List<DataplaneToken> dataplaneTokens;
 
     private PrepareParams(ApplicationId applicationId,
                           TimeoutBudget timeoutBudget,
@@ -90,7 +94,8 @@ public final class PrepareParams {
                           boolean force,
                           boolean waitForResourcesInPrepare,
                           List<X509Certificate> operatorCertificates,
-                          Optional<CloudAccount> cloudAccount) {
+                          Optional<CloudAccount> cloudAccount,
+                          List<DataplaneToken> dataplaneTokens) {
         this.timeoutBudget = timeoutBudget;
         this.applicationId = Objects.requireNonNull(applicationId);
         this.ignoreValidationErrors = ignoreValidationErrors;
@@ -108,6 +113,7 @@ public final class PrepareParams {
         this.waitForResourcesInPrepare = waitForResourcesInPrepare;
         this.operatorCertificates = operatorCertificates;
         this.cloudAccount = Objects.requireNonNull(cloudAccount);
+        this.dataplaneTokens = dataplaneTokens;
     }
 
     public static class Builder {
@@ -129,6 +135,7 @@ public final class PrepareParams {
         private List<TenantSecretStore> tenantSecretStores = List.of();
         private List<X509Certificate> operatorCertificates = List.of();
         private Optional<CloudAccount> cloudAccount = Optional.empty();
+        private List<DataplaneToken> dataplaneTokens = List.of();
 
         public Builder() { }
 
@@ -266,6 +273,11 @@ public final class PrepareParams {
             return this;
         }
 
+        public Builder dataplaneTokens(List<DataplaneToken> dataplaneTokens) {
+            this.dataplaneTokens = List.copyOf(dataplaneTokens);
+            return this;
+        }
+
         public PrepareParams build() {
             return new PrepareParams(applicationId,
                                      timeoutBudget,
@@ -283,7 +295,8 @@ public final class PrepareParams {
                                      force,
                                      waitForResourcesInPrepare,
                                      operatorCertificates,
-                                     cloudAccount);
+                                     cloudAccount,
+                                     dataplaneTokens);
         }
 
     }
@@ -327,6 +340,7 @@ public final class PrepareParams {
                 .waitForResourcesInPrepare(booleanValue(params, WAIT_FOR_RESOURCES_IN_PREPARE))
                 .operatorCertificates(deserialize(params.field(OPERATOR_CERTIFICATES), PrepareParams::readOperatorCertificates, List.of()))
                 .cloudAccount(deserialize(params.field(CLOUD_ACCOUNT), CloudAccountSerializer::fromSlime, null))
+                .dataplaneTokens(deserialize(params.field(DATAPLANE_TOKENS), DataplaneTokenSerializer::fromSlime, List.of()))
                 .build();
     }
 
@@ -444,4 +458,7 @@ public final class PrepareParams {
         return cloudAccount;
     }
 
+    public List<DataplaneToken> dataplaneTokens() {
+        return dataplaneTokens;
+    }
 }