Simplify

3 files changed, 14 insertions, 15 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationBasedResourceTarget.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationBasedResourceTarget.java
index d3c7fea97cc..8dd45ec26a1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationBasedResourceTarget.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationBasedResourceTarget.java
@@ -13,11 +13,6 @@ public class AllocationBasedResourceTarget extends ResourceTarget {
     }
 
     @Override
-    public double clusterCpu() {
-        return current().toAdvertisedClusterResources().nodeResources().vcpu() * current().nodes();
-    }
-
-    @Override
     public double groupMemory() {
         return current().toAdvertisedClusterResources().nodeResources().memoryGb() * current().groupSize();
     }
@@ -28,6 +23,9 @@ public class AllocationBasedResourceTarget extends ResourceTarget {
     }
 
     @Override
+    public double nodeCpu() { return current().toAdvertisedClusterResources().nodeResources().vcpu(); }
+
+    @Override
     public double nodeMemory() {
         return current().toAdvertisedClusterResources().nodeResources().memoryGb();
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/LoadBasedResourceTarget.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/LoadBasedResourceTarget.java
index 1e7354ccf08..6416c47c19d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/LoadBasedResourceTarget.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/LoadBasedResourceTarget.java
@@ -16,11 +16,6 @@ class LoadBasedResourceTarget extends ResourceTarget {
     }
 
     @Override
-    public double clusterCpu() {
-        return clusterUsage(Resource.cpu, cpuLoad) / Resource.cpu.idealAverageLoad();
-    }
-
-    @Override
     public double groupMemory() {
         return groupUsage(Resource.memory, memoryLoad) / Resource.memory.idealAverageLoad();
     }
@@ -31,6 +26,11 @@ class LoadBasedResourceTarget extends ResourceTarget {
     }
 
     @Override
+    public double nodeCpu() {
+        return nodeUsage(Resource.cpu, cpuLoad) / Resource.cpu.idealAverageLoad();
+    }
+
+    @Override
     public double nodeMemory() {
         return nodeUsage(Resource.memory, memoryLoad) / Resource.memory.idealAverageLoad();
     }
@@ -40,10 +40,6 @@ class LoadBasedResourceTarget extends ResourceTarget {
         return nodeUsage(Resource.disk, diskLoad) / Resource.disk.idealAverageLoad();
     }
 
-    private double clusterUsage(Resource resource, double load) {
-        return nodeUsage(resource, load) * current().nodes();
-    }
-
     private double groupUsage(Resource resource, double load) {
         return nodeUsage(resource, load) * current().groupSize();
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceTarget.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceTarget.java
index 97c7812729e..50a18fb6bf0 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceTarget.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceTarget.java
@@ -11,7 +11,9 @@ public abstract class ResourceTarget {
     }
 
     /** Returns the target total cpu to allocate to the entire cluster */
-    public abstract double clusterCpu();
+    public double clusterCpu() {
+        return nodeCpu() * current().nodes();
+    }
 
     /** Returns the target total memory to allocate to each group */
     public abstract double groupMemory();
@@ -19,6 +21,9 @@ public abstract class ResourceTarget {
     /** Returns the target total disk to allocate to each group */
     public abstract double groupDisk();
 
+    /** Returns the target cpu to allocate to each node */
+    public abstract double nodeCpu();
+
     /** Returns the target memory to allocate to each node */
     public abstract double nodeMemory();