Rename PreprovisionCapacity -> HostCapacity

5 files changed, 23 insertions, 24 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index 60daddc7ee0..108a1fe1bb9 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.flags;
 
 import com.yahoo.component.Vtag;
 import com.yahoo.vespa.defaults.Defaults;
-import com.yahoo.vespa.flags.custom.PreprovisionCapacity;
+import com.yahoo.vespa.flags.custom.HostCapacity;
 
 import java.util.List;
 import java.util.Optional;
@@ -122,11 +122,11 @@ public class Flags {
             "Takes effect on the next run of RetiredExpirer.",
             HOSTNAME);
 
-    public static final UnboundListFlag<PreprovisionCapacity> PREPROVISION_CAPACITY = defineListFlag(
-            "preprovision-capacity", List.of(), PreprovisionCapacity.class,
-            "List of node resources and their count that should be present in zone to receive new deployments. When a " +
-            "preprovisioned is taken, new will be provisioned within next iteration of maintainer.",
-            "Takes effect on next iteration of HostProvisionMaintainer.");
+    public static final UnboundListFlag<HostCapacity> PREPROVISION_CAPACITY = defineListFlag(
+            "preprovision-capacity", List.of(), HostCapacity.class,
+            "List of node resources and their count that should be unallocated in zone to receive new deployments. When a " +
+            "preprovisioned host is taken, another one will be provisioned within next iteration of maintainer.",
+            "Takes effect on next iteration of DynamicProvisioningMaintainer.");
 
     public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag(
             "default-term-wise-limit", 1.0,
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/custom/PreprovisionCapacity.java b/flags/src/main/java/com/yahoo/vespa/flags/custom/HostCapacity.java
index 01eab8dfb9c..947520ca2d7 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/custom/PreprovisionCapacity.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/custom/HostCapacity.java
@@ -10,7 +10,7 @@ import java.util.Objects;
  * @author freva
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PreprovisionCapacity {
+public class HostCapacity {
     @JsonProperty("vcpu")
     private final double vcpu;
 
@@ -23,10 +23,10 @@ public class PreprovisionCapacity {
     @JsonProperty("count")
     private final int count;
 
-    public PreprovisionCapacity(@JsonProperty("vcpu") double vcpu,
-                                @JsonProperty("memoryGb") double memoryGb,
-                                @JsonProperty("diskGb") double diskGb,
-                                @JsonProperty("count") int count) {
+    public HostCapacity(@JsonProperty("vcpu") double vcpu,
+                        @JsonProperty("memoryGb") double memoryGb,
+                        @JsonProperty("diskGb") double diskGb,
+                        @JsonProperty("count") int count) {
         this.vcpu = requirePositive("vcpu", vcpu);
         this.memoryGb = requirePositive("memoryGb", memoryGb);
         this.diskGb = requirePositive("diskGb", diskGb);
@@ -59,7 +59,7 @@ public class PreprovisionCapacity {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        PreprovisionCapacity that = (PreprovisionCapacity) o;
+        HostCapacity that = (HostCapacity) o;
         return Double.compare(that.vcpu, vcpu) == 0 &&
                 Double.compare(that.memoryGb, memoryGb) == 0 &&
                 Double.compare(that.diskGb, diskGb) == 0 &&
@@ -70,4 +70,4 @@ public class PreprovisionCapacity {
     public int hashCode() {
         return Objects.hash(vcpu, memoryGb, diskGb, count);
     }
-}
\ No newline at end of file
+}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
index 040ab99389d..164834fd0a9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
@@ -10,7 +10,7 @@ import com.yahoo.transaction.Mutex;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.ListFlag;
-import com.yahoo.vespa.flags.custom.PreprovisionCapacity;
+import com.yahoo.vespa.flags.custom.HostCapacity;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
@@ -43,7 +43,7 @@ public class DynamicProvisioningMaintainer extends NodeRepositoryMaintainer {
     private static final ApplicationId preprovisionAppId = ApplicationId.from("hosted-vespa", "tenant-host", "preprovision");
 
     private final HostProvisioner hostProvisioner;
-    private final ListFlag<PreprovisionCapacity> preprovisionCapacityFlag;
+    private final ListFlag<HostCapacity> preprovisionCapacityFlag;
 
     DynamicProvisioningMaintainer(NodeRepository nodeRepository,
                                   Duration interval,
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index a1d8ffb03d3..9173c7c1a97 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -11,13 +11,12 @@ import com.yahoo.transaction.Mutex;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.ListFlag;
-import com.yahoo.vespa.flags.custom.PreprovisionCapacity;
+import com.yahoo.vespa.flags.custom.HostCapacity;
 import com.yahoo.vespa.hosted.provision.LockedNodeList;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -31,7 +30,7 @@ public class GroupPreparer {
 
     private final NodeRepository nodeRepository;
     private final Optional<HostProvisioner> hostProvisioner;
-    private final ListFlag<PreprovisionCapacity> preprovisionCapacityFlag;
+    private final ListFlag<HostCapacity> preprovisionCapacityFlag;
 
     public GroupPreparer(NodeRepository nodeRepository,
                          Optional<HostProvisioner> hostProvisioner,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
index 507d875c69f..35b9ebb5502 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
@@ -18,7 +18,7 @@ import com.yahoo.test.ManualClock;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
-import com.yahoo.vespa.flags.custom.PreprovisionCapacity;
+import com.yahoo.vespa.flags.custom.HostCapacity;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.node.Allocation;
@@ -101,7 +101,7 @@ public class DynamicProvisioningMaintainerTest {
     @Test
     public void does_not_deprovision_when_preprovisioning_enabled() {
         var tester = new DynamicProvisioningTester().addInitialNodes();
-        tester.flagSource.withListFlag(Flags.PREPROVISION_CAPACITY.id(), List.of(new PreprovisionCapacity(1, 3, 2, 1)), PreprovisionCapacity.class);
+        tester.flagSource.withListFlag(Flags.PREPROVISION_CAPACITY.id(), List.of(new HostCapacity(1, 3, 2, 1)), HostCapacity.class);
         Optional<Node> failedHost = tester.nodeRepository.getNode("host2");
         assertTrue(failedHost.isPresent());
 
@@ -114,9 +114,9 @@ public class DynamicProvisioningMaintainerTest {
     public void provision_deficit_and_deprovision_excess() {
         var tester = new DynamicProvisioningTester().addInitialNodes();
         tester.flagSource.withListFlag(Flags.PREPROVISION_CAPACITY.id(),
-                                       List.of(new PreprovisionCapacity(2, 4, 8, 1),
-                                               new PreprovisionCapacity(2, 3, 2, 2)),
-                                       PreprovisionCapacity.class);
+                                       List.of(new HostCapacity(2, 4, 8, 1),
+                                               new HostCapacity(2, 3, 2, 2)),
+                                       HostCapacity.class);
         assertTrue(tester.nodeRepository.getNode("host2").isPresent());
         assertEquals(0 ,tester.hostProvisioner.provisionedHosts.size());
 
@@ -151,7 +151,7 @@ public class DynamicProvisioningMaintainerTest {
 
         private final ManualClock clock = new ManualClock();
         private final InMemoryFlagSource flagSource = new InMemoryFlagSource()
-                .withListFlag(Flags.PREPROVISION_CAPACITY.id(), List.of(), PreprovisionCapacity.class);
+                .withListFlag(Flags.PREPROVISION_CAPACITY.id(), List.of(), HostCapacity.class);
 
         private final Zone zone;
         private final NodeRepository nodeRepository;