From 2aaead7fd8822caf1984a8c5efe5ff4bb4292838 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Fri, 4 Jun 2021 16:17:00 +0200
Subject: Propagate autoscalingStatusCode

---
 .../vespa/hosted/controller/api/integration/configserver/Cluster.java | 4 ++++
 .../hosted/controller/api/integration/noderepository/ClusterData.java | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'controller-api')

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
index b3317c7f268..ccfd3241810 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
@@ -23,6 +23,7 @@ public class Cluster {
     private final Optional<ClusterResources> suggested;
     private final Utilization utilization;
     private final List<ScalingEvent> scalingEvents;
+    private final String autoscalingStatusCode;
     private final String autoscalingStatus;
     private final Duration scalingDuration;
     private final double maxQueryGrowthRate;
@@ -37,6 +38,7 @@ public class Cluster {
                    Optional<ClusterResources> suggested,
                    Utilization utilization,
                    List<ScalingEvent> scalingEvents,
+                   String autoscalingStatusCode,
                    String autoscalingStatus,
                    Duration scalingDuration,
                    double maxQueryGrowthRate,
@@ -50,6 +52,7 @@ public class Cluster {
         this.suggested = suggested;
         this.utilization = utilization;
         this.scalingEvents = scalingEvents;
+        this.autoscalingStatusCode = autoscalingStatusCode;
         this.autoscalingStatus = autoscalingStatus;
         this.scalingDuration = scalingDuration;
         this.maxQueryGrowthRate = maxQueryGrowthRate;
@@ -65,6 +68,7 @@ public class Cluster {
     public Optional<ClusterResources> suggested() { return suggested; }
     public Utilization utilization() { return utilization; }
     public List<ScalingEvent> scalingEvents() { return scalingEvents; }
+    public String autoscalingStatusCode() { return autoscalingStatusCode; }
     public String autoscalingStatus() { return autoscalingStatus; }
     public Duration scalingDuration() { return scalingDuration; }
     public double maxQueryGrowthRate() { return maxQueryGrowthRate; }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
index b6163809f26..6f9b2b496bf 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
@@ -35,6 +35,8 @@ public class ClusterData {
     public ClusterUtilizationData utilization;
     @JsonProperty("scalingEvents")
     public List<ScalingEventData> scalingEvents;
+    @JsonProperty("autoscalingStatusCode")
+    public String autoscalingStatusCode;
     @JsonProperty("autoscalingStatus")
     public String autoscalingStatus;
     @JsonProperty("scalingDuration")
@@ -55,6 +57,7 @@ public class ClusterData {
                            utilization == null ? Cluster.Utilization.empty() : utilization.toClusterUtilization(),
                            scalingEvents == null ? List.of()
                                                  : scalingEvents.stream().map(data -> data.toScalingEvent()).collect(Collectors.toList()),
+                           autoscalingStatusCode,
                            autoscalingStatus,
                            scalingDuration == null ? Duration.ofMillis(0) : Duration.ofMillis(scalingDuration),
                            maxQueryGrowthRate == null ? -1 : maxQueryGrowthRate,
-- 
cgit v1.2.3