No need for zone argument

7 files changed, 7 insertions, 9 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java
index 3a3a5d80b72..9b2a67da1c1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.provision.provisioning;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
-import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.Nodelike;
 import com.yahoo.vespa.hosted.provision.lb.LoadBalancerService;
@@ -48,7 +47,7 @@ public class EmptyProvisionServiceProvider implements ProvisionServiceProvider {
         public NodeResources realToRequest(NodeResources resources) { return resources; }
 
         @Override
-        public long thinPoolSizeInBase2Gb(Zone zone, NodeType nodeType) { return 0; }
+        public long thinPoolSizeInBase2Gb(NodeType nodeType) { return 0; }
 
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostResourcesCalculator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostResourcesCalculator.java
index 40ecaa8a7a3..d62960f5426 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostResourcesCalculator.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostResourcesCalculator.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.provision.provisioning;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
-import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.Nodelike;
 
@@ -39,6 +38,6 @@ public interface HostResourcesCalculator {
     /**
      * Returns the needed thin pool size in base2 Gb.
      */
-    long thinPoolSizeInBase2Gb(Zone zone, NodeType nodeType);
+    long thinPoolSizeInBase2Gb(NodeType nodeType);
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
index d2347fe0cb6..0a758ee585b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
@@ -79,7 +79,7 @@ public class NodeResourceLimits {
     // Note: Assumes node type 'host'
     private long getThinPoolSize(NodeResources.StorageType storageType) {
         if (storageType == NodeResources.StorageType.local && zone().getCloud().dynamicProvisioning())
-            return nodeRepository.resourcesCalculator().thinPoolSizeInBase2Gb(zone(), NodeType.host);
+            return nodeRepository.resourcesCalculator().thinPoolSizeInBase2Gb(NodeType.host);
         else
             return 4;
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
index a8a0a853ee4..33e2ec88d0a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
@@ -393,7 +393,7 @@ public class AutoscalingTest {
         }
 
         @Override
-        public long thinPoolSizeInBase2Gb(Zone zone, NodeType nodeType) { return 0; }
+        public long thinPoolSizeInBase2Gb(NodeType nodeType) { return 0; }
 
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
index 717fcc85f82..801923e1d9e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
@@ -266,7 +266,7 @@ class AutoscalingTester {
         }
 
         @Override
-        public long thinPoolSizeInBase2Gb(Zone zone, NodeType nodeType) { return 0; }
+        public long thinPoolSizeInBase2Gb(NodeType nodeType) { return 0; }
 
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java
index e5c518d1efd..4ae20eb5ae2 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java
@@ -124,7 +124,7 @@ public class DockerProvisioningCompleteHostCalculatorTest {
         }
 
         @Override
-        public long thinPoolSizeInBase2Gb(Zone zone, NodeType nodeType) { return 0; }
+        public long thinPoolSizeInBase2Gb(NodeType nodeType) { return 0; }
 
         /**
          * Returns the memory overhead resulting if the given advertised resources are placed on the given node
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index a0aa594bd2f..dd8b04ebf69 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -748,7 +748,7 @@ public class ProvisioningTester {
         }
 
         @Override
-        public long thinPoolSizeInBase2Gb(Zone zone, NodeType nodeType) { return 0; }
+        public long thinPoolSizeInBase2Gb(NodeType nodeType) { return 0; }
 
     }