Merge remote-tracking branch 'origin/master' into ogronnesby/gpu-billing

Conflicts:
	controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java

6 files changed, 42 insertions, 75 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java
index 2c496b1e3e5..89226d3309e 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java
@@ -42,13 +42,17 @@ public class PlanRegistryMock implements PlanRegistry {
         private final boolean supported;
 
         public MockPlan(String planId, boolean billed, boolean supported, double cpuPrice, double memPrice, double dgbPrice, double gpuPrice, int quota, String description) {
-            this(PlanId.from(planId), billed, supported, new MockCostCalculator(cpuPrice, memPrice, dgbPrice, gpuPrice), () -> Quota.unlimited().withBudget(quota), description);
+            this(PlanId.from(planId), billed, supported, new MockCostCalculator(cpuPrice, memPrice, dgbPrice, gpuPrice), () -> createQuota(quota), description);
         }
 
         public MockPlan(String planId, boolean billed, boolean supported, String cpuPrice, String memPrice, String dgbPrice, String gpuPrice, int quota, String description) {
-            this(PlanId.from(planId), billed, supported, new MockCostCalculator(cpuPrice, memPrice, dgbPrice, gpuPrice), () -> Quota.unlimited().withBudget(quota), description);
+            this(PlanId.from(planId), billed, supported, new MockCostCalculator(cpuPrice, memPrice, dgbPrice, gpuPrice), () -> createQuota(quota), description);
         }
 
+        private static Quota createQuota(int quota) {
+            return quota == 0 ? Quota.zero() : Quota.unlimited().withBudget(quota);
+        }
+        
         public MockPlan(PlanId planId, boolean billed, boolean supported, MockCostCalculator calculator, QuotaCalculator quota, String description) {
             this.planId = planId;
             this.billed = billed;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorImpl.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorImpl.java
index ecea1ce6913..cff61f1a50a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorImpl.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorImpl.java
@@ -69,7 +69,9 @@ public class EndpointCertificateValidatorImpl implements EndpointCertificateVali
             // Normally because the cert is in the process of being provisioned - this will cause a retry in InternalStepRunner
             throw new EndpointCertificateException(EndpointCertificateException.Type.CERT_NOT_AVAILABLE, "Certificate not found in secret store");
         } catch (EndpointCertificateException e) {
-            log.log(Level.WARNING, "Certificate validation failure for " + serializedInstanceId, e);
+            if (!e.type().equals(EndpointCertificateException.Type.CERT_NOT_AVAILABLE)) { // such failures are normal and will be retried, it takes some time to show up in the secret store
+                log.log(Level.WARNING, "Certificate validation failure for " + serializedInstanceId, e);
+            }
             throw e;
         } catch (Exception e) {
             log.log(Level.WARNING, "Certificate validation failure for " + serializedInstanceId, e);
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
index 04604ae7007..eb2005bf268 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
@@ -1,11 +1,9 @@
 // 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.deployment;
 
-import ai.vespa.validation.Validation;
 import com.yahoo.component.Version;
 
 import java.time.Instant;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalLong;
 
@@ -33,6 +31,7 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
     private final Optional<String> sourceUrl;
     private final Optional<String> commit;
     private final Optional<String> bundleHash;
+    private final Optional<Instant> obsoleteAt;
     private final boolean hasPackage;
     private final boolean shouldSkip;
     private final Optional<String> description;
@@ -41,7 +40,7 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
     public ApplicationVersion(RevisionId id, Optional<SourceRevision> source, Optional<String> authorEmail,
                               Optional<Version> compileVersion, Optional<Integer> allowedMajor, Optional<Instant> buildTime,
                               Optional<String> sourceUrl, Optional<String> commit, Optional<String> bundleHash,
-                              boolean hasPackage, boolean shouldSkip, Optional<String> description, int risk) {
+                              Optional<Instant> obsoleteAt, boolean hasPackage, boolean shouldSkip, Optional<String> description, int risk) {
 
         if (commit.isPresent() && commit.get().length() > 128)
             throw new IllegalArgumentException("Commit may not be longer than 128 characters");
@@ -61,6 +60,7 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
         this.sourceUrl = requireNonNull(sourceUrl, "sourceUrl cannot be null");
         this.commit = requireNonNull(commit, "commit cannot be null");
         this.bundleHash = bundleHash;
+        this.obsoleteAt = obsoleteAt;
         this.hasPackage = hasPackage;
         this.shouldSkip = shouldSkip;
         this.description = description;
@@ -71,19 +71,9 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
         return id;
     }
 
-    /** Create an application package version from a completed build, without an author email */
-    public static ApplicationVersion from(RevisionId id, SourceRevision source) {
-        return new ApplicationVersion(id, Optional.of(source), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), true, false, Optional.empty(), 0);
-    }
-
-    /** Creates a version from a completed build, an author email, and build metadata. */
-    public static ApplicationVersion from(RevisionId id, SourceRevision source, String authorEmail, Version compileVersion, Instant buildTime) {
-        return new ApplicationVersion(id, Optional.of(source), Optional.of(authorEmail), Optional.of(compileVersion), Optional.empty(), Optional.of(buildTime), Optional.empty(), Optional.empty(), Optional.empty(), true, false, Optional.empty(), 0);
-    }
-
     /** Creates a minimal version for a development build. */
     public static ApplicationVersion forDevelopment(RevisionId id, Optional<Version> compileVersion, Optional<Integer> allowedMajor) {
-        return new ApplicationVersion(id, Optional.empty(), Optional.empty(), compileVersion, allowedMajor, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), true, false, Optional.empty(), 0);
+        return new ApplicationVersion(id, Optional.empty(), Optional.empty(), compileVersion, allowedMajor, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), true, false, Optional.empty(), 0);
     }
 
     /** Creates a version from a completed build, an author email, and build metadata. */
@@ -91,7 +81,7 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
                                                    Optional<Version> compileVersion, Optional<Integer> allowedMajor, Optional<Instant> buildTime, Optional<String> sourceUrl,
                                                    Optional<String> commit, Optional<String> bundleHash, Optional<String> description, int risk) {
         return new ApplicationVersion(id, source, authorEmail, compileVersion, allowedMajor, buildTime,
-                                      sourceUrl, commit, bundleHash, true, false, description, risk);
+                                      sourceUrl, commit, bundleHash, Optional.empty(), true, false, description, risk);
     }
 
     /** Returns a unique identifier for this version or "unknown" if version is not known */
@@ -150,7 +140,17 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
 
     /** Returns a copy of this without a package stored. */
     public ApplicationVersion withoutPackage() {
-        return new ApplicationVersion(id, source, authorEmail, compileVersion, allowedMajor, buildTime, sourceUrl, commit, bundleHash, false, shouldSkip, description, risk);
+        return new ApplicationVersion(id, source, authorEmail, compileVersion, allowedMajor, buildTime, sourceUrl, commit, bundleHash, obsoleteAt, false, shouldSkip, description, risk);
+    }
+
+    /** Returns a copy of this which is obsolete now. */
+    public ApplicationVersion obsoleteAt(Instant now) {
+        return new ApplicationVersion(id, source, authorEmail, compileVersion, allowedMajor, buildTime, sourceUrl, commit, bundleHash, Optional.of(now), hasPackage, shouldSkip, description, risk);
+    }
+
+    /** Returns the instant at which this became obsolete, i.e., no longer relevant for automated deployments. */
+    public Optional<Instant> obsoleteAt() {
+        return obsoleteAt;
     }
 
     /** Whether we still have the package for this revision. */
@@ -160,7 +160,7 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
 
     /** Returns a copy of this which will not be rolled out to production. */
     public ApplicationVersion skipped() {
-        return new ApplicationVersion(id, source, authorEmail, compileVersion, allowedMajor, buildTime, sourceUrl, commit, bundleHash, hasPackage, true, description, risk);
+        return new ApplicationVersion(id, source, authorEmail, compileVersion, allowedMajor, buildTime, sourceUrl, commit, bundleHash, obsoleteAt, hasPackage, true, description, risk);
     }
 
     /** Whether we still have the package for this revision. */
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
index 945e0730fe6..34a7c1a6f7c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
@@ -113,6 +113,8 @@ public class NodeRepositoryNode {
     private String cloudAccount;
     @JsonProperty("wireguardPubKey")
     private String wireguardPubKey;
+    @JsonProperty("archiveUri")
+    private String archiveUri;
 
     public String getUrl() {
         return url;
@@ -460,6 +462,10 @@ public class NodeRepositoryNode {
 
     public void setWireguardPubKey(String wireguardPubKey) { this.wireguardPubKey = wireguardPubKey; }
 
+    public String getArchiveUri() { return archiveUri; }
+
+    public void setArchiveUri(String archiveUri) { this.archiveUri = archiveUri; }
+
     // --- Helper methods for code that (wrongly) consume this directly
 
     public boolean hasType(NodeType type) {
@@ -521,6 +527,7 @@ public class NodeRepositoryNode {
                ", switchHostname='" + switchHostname + '\'' +
                ", cloudAccount='" + cloudAccount + '\'' +
                ", wireguardPubKey='" + wireguardPubKey + '\'' +
+               ", archiveUri='" + archiveUri + '\'' +
                '}';
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/vcmr/HostAction.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/vcmr/HostAction.java
index f3bee721343..85c7f78eabc 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/vcmr/HostAction.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/vcmr/HostAction.java
@@ -67,6 +67,7 @@ public class HostAction {
         OUT_OF_SYNC,
         NONE,
         RETIRING,
+        READY,
         RETIRED,
         COMPLETE
     }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/vcmr/VcmrReport.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/vcmr/VcmrReport.java
index 969e6fb1e01..660f3c50556 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/vcmr/VcmrReport.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/vcmr/VcmrReport.java
@@ -11,7 +11,6 @@ import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 import static com.yahoo.yolean.Exceptions.uncheck;
@@ -47,18 +46,18 @@ public class VcmrReport {
     /**
      * @return true if list of VCMRs is changed
      */
-    public boolean addVcmr(String id, ZonedDateTime plannedStartTime, ZonedDateTime plannedEndtime) {
-        var vcmr = new Vcmr(id, plannedStartTime, plannedEndtime);
+    public boolean addVcmr(ChangeRequestSource source) {
+        var vcmr = new Vcmr(source.getId(), source.getStatus().name(), source.getPlannedStartTime(), source.getPlannedEndTime());
         if (vcmrs.contains(vcmr))
             return false;
 
         // Remove to catch any changes in start/end time
-        removeVcmr(id);
+        removeVcmr(source.getId());
         return vcmrs.add(vcmr);
     }
 
     public boolean removeVcmr(String id) {
-        return vcmrs.removeIf(vcmr -> id.equals(vcmr.getId()));
+        return vcmrs.removeIf(vcmr -> id.equals(vcmr.id()));
     }
 
     public static String getReportId() {
@@ -93,55 +92,9 @@ public class VcmrReport {
         return "VCMRReport{" + vcmrs + "}";
     }
 
-    public static class Vcmr {
-
-        private String id;
-        private ZonedDateTime plannedStartTime;
-        private ZonedDateTime plannedEndTime;
-
-        Vcmr(@JsonProperty("id") String id,
-             @JsonProperty("plannedStartTime") ZonedDateTime plannedStartTime,
-             @JsonProperty("plannedEndTime") ZonedDateTime plannedEndTime) {
-            this.id = id;
-            this.plannedStartTime = plannedStartTime;
-            this.plannedEndTime = plannedEndTime;
-        }
-
-        public String getId() {
-            return id;
-        }
-
-        public ZonedDateTime getPlannedStartTime() {
-            return plannedStartTime;
-        }
-
-        public ZonedDateTime getPlannedEndTime() {
-            return plannedEndTime;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Vcmr vcmr = (Vcmr) o;
-            return Objects.equals(id, vcmr.id) &&
-                    Objects.equals(plannedStartTime, vcmr.plannedStartTime) &&
-                    Objects.equals(plannedEndTime, vcmr.plannedEndTime);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, plannedStartTime, plannedEndTime);
-        }
-
-        @Override
-        public String toString() {
-            return "VCMR{" +
-                    "id='" + id + '\'' +
-                    ", plannedStartTime=" + plannedStartTime +
-                    ", plannedEndTime=" + plannedEndTime +
-                    '}';
-        }
-    }
+    public record Vcmr (@JsonProperty("id") String id,
+                        @JsonProperty("status") String status,
+                        @JsonProperty("plannedStartTime") ZonedDateTime plannedStartTime,
+                        @JsonProperty("plannedEndTime") ZonedDateTime plannedEndTime) {}
 
 }