Renamed wantToUnprovision to wantToDeprovision

5 files changed, 30 insertions, 30 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
index 9136ab5da2e..994ae31b280 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
@@ -96,12 +96,12 @@ public class NodeRetirer extends Maintainer {
                     Flavor flavorWithMinSpareNodes = getMinAmongstKeys(numSpareNodesByFlavor, possibleReplacementFlavors);
                     long spareNodesForMinFlavor = numSpareNodesByFlavor.getOrDefault(flavorWithMinSpareNodes, 0L);
                     if (spareNodesForMinFlavor > 0) {
-                        log.info("Setting node " + retireableNode + " to wantToRetire and wantToUnprovision. Policy: " +
+                        log.info("Setting node " + retireableNode + " to wantToRetire and wantToDeprovision. Policy: " +
                                 retirementPolicy.getClass().getSimpleName());
                         Node updatedNode = retireableNode
                                 .with(retireableNode.status()
                                         .withWantToRetire(true)
-                                        .withWantToUnprovision(true));
+                                        .withWantToDeprovision(true));
                         nodeRepository().write(updatedNode);
                         numSpareNodesByFlavor.put(flavorWithMinSpareNodes, spareNodesForMinFlavor - 1);
                         numNodesAllowedToRetire--;
@@ -151,7 +151,7 @@ public class NodeRetirer extends Maintainer {
     }
 
     /**
-     * Parks and sets wantToUnprovision for a subset of size 'limit' of nodes
+     * Parks and sets wantToDeprovision for a subset of size 'limit' of nodes
      *
      * @param nodesToPark Nodes that we want to park
      * @param limit Maximum number of nodes we want to park
@@ -161,7 +161,7 @@ public class NodeRetirer extends Maintainer {
         nodesToPark.stream()
                 .limit(limit)
                 .forEach(node -> {
-                    nodeRepository().write(node.with(node.status().withWantToUnprovision(true)));
+                    nodeRepository().write(node.with(node.status().withWantToDeprovision(true)));
                     nodeRepository().park(node.hostname(), Agent.NodeRetirer, "Policy: " + retirementPolicy.getClass().getSimpleName());
                 });
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
index 00cd1128b89..e8a24b85714 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
@@ -22,7 +22,7 @@ public class Status {
     private final int failCount;
     private final Optional<HardwareFailureType> hardwareFailure;
     private final boolean wantToRetire;
-    private final boolean wantToUnprovision;
+    private final boolean wantToDeprovision;
     
     public enum HardwareFailureType {
         
@@ -42,7 +42,7 @@ public class Status {
                   int failCount,
                   Optional<HardwareFailureType> hardwareFailure,
                   boolean wantToRetire,
-                  boolean wantToUnprovision) {
+                  boolean wantToDeprovision) {
         this.reboot = generation;
         this.vespaVersion = vespaVersion;
         this.hostedVersion = hostedVersion;
@@ -50,29 +50,29 @@ public class Status {
         this.failCount = failCount;
         this.hardwareFailure = hardwareFailure;
         this.wantToRetire = wantToRetire;
-        this.wantToUnprovision = wantToUnprovision;
+        this.wantToDeprovision = wantToDeprovision;
     }
 
     /** Returns a copy of this with the reboot generation changed */
-    public Status withReboot(Generation reboot) { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToUnprovision); }
+    public Status withReboot(Generation reboot) { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToDeprovision); }
 
     /** Returns the reboot generation of this node */
     public Generation reboot() { return reboot; }
 
     /** Returns a copy of this with the vespa version changed */
-    public Status withVespaVersion(Version version) { return new Status(reboot, Optional.of(version), hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToUnprovision); }
+    public Status withVespaVersion(Version version) { return new Status(reboot, Optional.of(version), hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToDeprovision); }
 
     /** Returns the Vespa version installed on the node, if known */
     public Optional<Version> vespaVersion() { return vespaVersion; }
 
     /** Returns a copy of this with the hosted version changed */
-    public Status withHostedVersion(Version version) { return new Status(reboot, vespaVersion, Optional.of(version), stateVersion, failCount, hardwareFailure, wantToRetire, wantToUnprovision); }
+    public Status withHostedVersion(Version version) { return new Status(reboot, vespaVersion, Optional.of(version), stateVersion, failCount, hardwareFailure, wantToRetire, wantToDeprovision); }
 
     /** Returns the hosted version installed on the node, if known */
     public Optional<Version> hostedVersion() { return hostedVersion; }
 
     /** Returns a copy of this with the state version changed */
-    public Status withStateVersion(String version) { return new Status(reboot, vespaVersion, hostedVersion, Optional.of(version), failCount, hardwareFailure, wantToRetire, wantToUnprovision); }
+    public Status withStateVersion(String version) { return new Status(reboot, vespaVersion, hostedVersion, Optional.of(version), failCount, hardwareFailure, wantToRetire, wantToDeprovision); }
 
     /**
      * Returns the state version the node last successfully converged with.
@@ -88,29 +88,29 @@ public class Status {
                 .filter(image -> !image.isEmpty())
                 .map(DockerImage::new)
                 .map(DockerImage::tagAsVersion);
-        return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToUnprovision);
+        return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToDeprovision);
     }
 
     /** Returns the current docker image the node is running, if known. */
     public Optional<String> dockerImage() { return vespaVersion.map(DockerImage.defaultImage::withTag).map(DockerImage::toString); }
 
-    public Status withIncreasedFailCount() { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount + 1, hardwareFailure, wantToRetire, wantToUnprovision); }
+    public Status withIncreasedFailCount() { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount + 1, hardwareFailure, wantToRetire, wantToDeprovision); }
 
-    public Status withDecreasedFailCount() { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount - 1, hardwareFailure, wantToRetire, wantToUnprovision); }
+    public Status withDecreasedFailCount() { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount - 1, hardwareFailure, wantToRetire, wantToDeprovision); }
 
-    public Status setFailCount(Integer value) { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, value, hardwareFailure, wantToRetire, wantToUnprovision); }
+    public Status setFailCount(Integer value) { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, value, hardwareFailure, wantToRetire, wantToDeprovision); }
 
     /** Returns how many times this node has been moved to the failed state. */
     public int failCount() { return failCount; }
 
-    public Status withHardwareFailure(Optional<HardwareFailureType> hardwareFailure) { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToUnprovision); }
+    public Status withHardwareFailure(Optional<HardwareFailureType> hardwareFailure) { return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToDeprovision); }
 
     /** Returns the type of the last hardware failure detected on this node, or empty if none */
     public Optional<HardwareFailureType> hardwareFailure() { return hardwareFailure; }
 
     /** Returns a copy of this with the want to retire flag changed */
     public Status withWantToRetire(boolean wantToRetire) {
-        return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToUnprovision);
+        return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToDeprovision);
     }
 
     /**
@@ -121,16 +121,16 @@ public class Status {
         return wantToRetire;
     }
 
-    /** Returns a copy of this with the want to unprovision flag changed */
-    public Status withWantToUnprovision(boolean wantToUnprovision) {
-        return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToUnprovision);
+    /** Returns a copy of this with the want to deprovision flag changed */
+    public Status withWantToDeprovision(boolean wantToDeprovision) {
+        return new Status(reboot, vespaVersion, hostedVersion, stateVersion, failCount, hardwareFailure, wantToRetire, wantToDeprovision);
     }
 
     /**
-     * Returns whether this node should be unprovisioned when possible.
+     * Returns whether this node should be deprovisioned when possible.
      */
-    public boolean wantToUnprovision() {
-        return wantToUnprovision;
+    public boolean wantToDeprovision() {
+        return wantToDeprovision;
     }
 
     /** Returns the initial status of a newly provisioned node */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 173ce77244e..582f97361b2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -60,7 +60,7 @@ public class NodeSerializer {
     private static final String hardwareFailureKey = "hardwareFailure";
     private static final String nodeTypeKey = "type";
     private static final String wantToRetireKey = "wantToRetire";
-    private static final String wantToUnprovisionKey = "wantToUnprovision";
+    private static final String wantToDeprovisionKey = "wantToDeprovision";
 
     // Configuration fields
     private static final String flavorKey = "flavor";
@@ -113,7 +113,7 @@ public class NodeSerializer {
         object.setLong(failCountKey, node.status().failCount());
         node.status().hardwareFailure().ifPresent(failure -> object.setString(hardwareFailureKey, toString(failure)));
         object.setBool(wantToRetireKey, node.status().wantToRetire());
-        object.setBool(wantToUnprovisionKey, node.status().wantToUnprovision());
+        object.setBool(wantToDeprovisionKey, node.status().wantToDeprovision());
         node.allocation().ifPresent(allocation -> toSlime(allocation, object.setObject(instanceKey)));
         toSlime(node.history(), object.setArray(historyKey));
         object.setString(nodeTypeKey, toString(node.type()));
@@ -167,7 +167,7 @@ public class NodeSerializer {
 
     private Status statusFromSlime(Inspector object) {
         // TODO: Simplify after June 2017
-        boolean wantToUnprovision = object.field(wantToUnprovisionKey).valid() && object.field(wantToUnprovisionKey).asBool();
+        boolean wantToDeprovision = object.field(wantToDeprovisionKey).valid() && object.field(wantToDeprovisionKey).asBool();
         return new Status(generationFromSlime(object, rebootGenerationKey, currentRebootGenerationKey),
                           versionFromSlime(object.field(vespaVersionKey)),
                           versionFromSlime(object.field(hostedVersionKey)),
@@ -175,7 +175,7 @@ public class NodeSerializer {
                           (int)object.field(failCountKey).asLong(),
                           hardwareFailureFromSlime(object.field(hardwareFailureKey)),
                           object.field(wantToRetireKey).asBool(),
-                          wantToUnprovision);
+                          wantToDeprovision);
     }
 
     private Flavor flavorFromSlime(Inspector object) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
index 23ee2421d4d..b410b0c8ead 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
@@ -87,8 +87,8 @@ public class NodePatcher {
                 return node.withAdditionalIpAddresses(asStringSet(value));
             case "wantToRetire" :
                 return node.with(node.status().withWantToRetire(asBoolean(value)));
-            case "wantToUnprovision" :
-                return node.with(node.status().withWantToUnprovision(asBoolean(value)));
+            case "wantToDeprovision" :
+                return node.with(node.status().withWantToDeprovision(asBoolean(value)));
             default :
                 throw new IllegalArgumentException("Could not apply field '" + name + "' on a node: No such modifiable field");
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
index d146a7dcaa2..00bec80b758 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
@@ -171,7 +171,7 @@ class NodesResponse extends HttpResponse {
         object.setBool("hardwareFailure", node.status().hardwareFailure().isPresent());
         node.status().hardwareFailure().ifPresent(failure -> object.setString("hardwareFailureType", toString(failure)));
         object.setBool("wantToRetire", node.status().wantToRetire());
-        object.setBool("wantToUnprovision", node.status().wantToUnprovision());
+        object.setBool("wantToDeprovision", node.status().wantToDeprovision());
         toSlime(node.history(), object.setArray("history"));
         ipAddressesToSlime(node.ipAddresses(), object.setArray("ipAddresses"));
         ipAddressesToSlime(node.additionalIpAddresses(), object.setArray("additionalIpAddresses"));