Remove average and current utilization: Not used

8 files changed, 14 insertions, 72 deletions

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 08f975fbc29..cab32c7b5ce 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
@@ -82,47 +82,35 @@ public class Cluster {
 
     public static class Utilization {
 
-        private final double cpu, idealCpu, currentCpu, peakCpu;
-        private final double memory, idealMemory, currentMemory, peakMemory;
-        private final double disk, idealDisk, currentDisk, peakDisk;
-
-        public Utilization(double cpu, double idealCpu, double currentCpu, double peakCpu,
-                           double memory, double idealMemory, double currentMemory, double peakMemory,
-                           double disk, double idealDisk, double currentDisk, double peakDisk) {
-            this.cpu = cpu;
+        private final double idealCpu, peakCpu;
+        private final double idealMemory, peakMemory;
+        private final double idealDisk, peakDisk;
+
+        public Utilization(double idealCpu, double peakCpu,
+                           double idealMemory, double peakMemory,
+                           double idealDisk, double peakDisk) {
             this.idealCpu = idealCpu;
-            this.currentCpu = currentCpu;
             this.peakCpu = peakCpu;
 
-            this.memory = memory;
             this.idealMemory = idealMemory;
-            this.currentMemory = currentMemory;
             this.peakMemory = peakMemory;
 
-            this.disk = disk;
             this.idealDisk = idealDisk;
-            this.currentDisk = currentDisk;
             this.peakDisk = peakDisk;
         }
 
-        public double cpu() { return cpu; }
         public double idealCpu() { return idealCpu; }
-        public double currentCpu() { return currentCpu; }
         public double peakCpu() { return peakCpu; }
 
-        public double memory() { return memory; }
         public double idealMemory() { return idealMemory; }
-        public double currentMemory() { return currentMemory; }
         public double peakMemory() { return peakMemory; }
 
-        public double disk() { return disk; }
         public double idealDisk() { return idealDisk; }
-        public double currentDisk() { return currentDisk; }
         public double peakDisk() { return peakDisk; }
 
-        public static Utilization empty() { return new Utilization(0, 0, 0, 0, 0,
-                                                                   0, 0, 0,
-                                                                   0, 0, 0, 0); }
+        public static Utilization empty() { return new Utilization(0, 0,
+                                                                   0, 0,
+                                                                   0, 0); }
 
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java
index 6632ba47b7b..b4fee25d1ad 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java
@@ -15,37 +15,23 @@ import com.yahoo.vespa.hosted.controller.api.integration.configserver.Cluster;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ClusterUtilizationData {
 
-    @JsonProperty("cpu")
-    public Double cpu;
     @JsonProperty("idealCpu")
     public Double idealCpu;
-    @JsonProperty("currentCpu")
-    public Double currentCpu;
     @JsonProperty("peakCpu")
     public Double peakCpu;
 
-    @JsonProperty("memory")
-    public Double memory;
     @JsonProperty("idealMemory")
     public Double idealMemory;
-    @JsonProperty("currentMemory")
-    public Double currentMemory;
     @JsonProperty("peakMemory")
     public Double peakMemory;
 
-    @JsonProperty("disk")
-    public Double disk;
     @JsonProperty("idealDisk")
     public Double idealDisk;
-    @JsonProperty("currentDisk")
-    public Double currentDisk;
     @JsonProperty("peakDisk")
     public Double peakDisk;
 
     public Cluster.Utilization toClusterUtilization() {
-        return new Cluster.Utilization(cpu, idealCpu, currentCpu, peakCpu,
-                                       memory, idealMemory, currentMemory, peakMemory,
-                                       disk, idealDisk, currentDisk, peakDisk);
+        return new Cluster.Utilization(idealCpu, peakCpu, idealMemory, peakMemory, idealDisk, peakDisk);
     }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index a10f79d1727..2fffdc25875 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -2705,19 +2705,13 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
     }
 
     private void utilizationToSlime(Cluster.Utilization utilization, Cursor utilizationObject) {
-        utilizationObject.setDouble("cpu", utilization.cpu());
         utilizationObject.setDouble("idealCpu", utilization.idealCpu());
-        utilizationObject.setDouble("currentCpu", utilization.currentCpu());
         utilizationObject.setDouble("peakCpu", utilization.peakCpu());
 
-        utilizationObject.setDouble("memory", utilization.memory());
         utilizationObject.setDouble("idealMemory", utilization.idealMemory());
-        utilizationObject.setDouble("currentMemory", utilization.currentMemory());
         utilizationObject.setDouble("peakMemory", utilization.peakMemory());
 
-        utilizationObject.setDouble("disk", utilization.disk());
         utilizationObject.setDouble("idealDisk", utilization.idealDisk());
-        utilizationObject.setDouble("currentDisk", utilization.currentDisk());
         utilizationObject.setDouble("peakDisk", utilization.peakDisk());
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index 21f76ac4303..64d34e55a03 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -116,9 +116,9 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
                                       current,
                                       Optional.of(new ClusterResources(2, 1, new NodeResources(3, 8, 50, 1, slow, remote))),
                                       Optional.empty(),
-                                      new Cluster.Utilization(0.1, 0.2, 0.3, 0.35,
-                                                              0.4, 0.5, 0.6, 0.65,
-                                                              0.7, 0.8, 0.9, 1.0),
+                                      new Cluster.Utilization(0.2, 0.35,
+                                                              0.5, 0.65,
+                                                              0.8, 1.0),
                                       List.of(new Cluster.ScalingEvent(new ClusterResources(0, 0, NodeResources.unspecified()),
                                                                        current,
                                                                        Instant.ofEpochMilli(1234),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
index 137ea64eba7..6527237840e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
@@ -55,17 +55,11 @@
         "cost": 0.29
       },
       "utilization": {
-        "cpu": 0.1,
         "idealCpu": 0.2,
-        "currentCpu": 0.3,
         "peakCpu": 0.35,
-        "memory": 0.4,
         "idealMemory": 0.5,
-        "currentMemory": 0.6,
         "peakMemory": 0.65,
-        "disk": 0.7,
         "idealDisk": 0.8,
-        "currentDisk": 0.9,
         "peakDisk": 1.0
       },
       "scalingEvents": [
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
index 0603eb97cca..b6103bb23fa 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
@@ -96,23 +96,15 @@ public class ApplicationSerializer {
 
     private static void clusterUtilizationToSlime(ClusterModel clusterModel, Cursor utilizationObject) {
         Load idealLoad = clusterModel.idealLoad();
-        Load averageLoad = clusterModel.averageLoad();
-        Load currentLoad = clusterModel.currentLoad();
         Load peakLoad = clusterModel.peakLoad();
 
-        utilizationObject.setDouble("cpu", averageLoad.cpu());
         utilizationObject.setDouble("idealCpu", idealLoad.cpu());
-        utilizationObject.setDouble("currentCpu", currentLoad.cpu());
         utilizationObject.setDouble("peakCpu", peakLoad.cpu());
 
-        utilizationObject.setDouble("memory", averageLoad.memory());
         utilizationObject.setDouble("idealMemory", idealLoad.memory());
-        utilizationObject.setDouble("currentMemory", currentLoad.memory());
         utilizationObject.setDouble("peakMemory", peakLoad.memory());
 
-        utilizationObject.setDouble("disk", averageLoad.disk());
         utilizationObject.setDouble("idealDisk", idealLoad.disk());
-        utilizationObject.setDouble("currentDisk", currentLoad.disk());
         utilizationObject.setDouble("peakDisk", peakLoad.disk());
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json
index 0d640f7e3b2..02aef6fa9c4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json
@@ -70,17 +70,11 @@
         }
       },
       "utilization" : {
-          "cpu" : 0.0,
           "idealCpu": 0.40750000000000003,
-          "currentCpu": 0.0,
           "peakCpu": 0.0,
-          "memory" : 0.0,
           "idealMemory": 0.8,
-          "currentMemory": 0.0,
           "peakMemory": 0.0,
-          "disk" : 0.0,
           "idealDisk": 0.95,
-          "currentDisk": 0.0,
           "peakDisk": 0.0
       },
       "scalingEvents" : [
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json
index 80da118f620..341fa5f6031 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json
@@ -44,17 +44,11 @@
         }
       },
       "utilization" : {
-        "cpu" : 0.0,
         "idealCpu": 0.42670157068062825,
-        "currentCpu": 0.0,
         "peakCpu": 0.0,
-        "memory" : 0.0,
         "idealMemory": 0.325,
-        "currentMemory": 0.0,
         "peakMemory": 0.0,
-        "disk" : 0.0,
         "idealDisk": 0.3,
-        "currentDisk": 0.0,
         "peakDisk": 0.0
       },
       "scalingEvents" : [