Remove average and current utilization: Not used

2 files changed, 11 insertions, 37 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);
     }
 
 }