Merge pull request #3375 from vespa-engine/freva/remove-hardware-failure-type

Remove hardwareFailureType

4 files changed, 1 insertions, 31 deletions

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 2beabcd8e8f..d146e976121 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
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
  */
 public class NodePatcher {
 
-    public static final String HARDWARE_FAILURE_TYPE = "hardwareFailureType";
     public static final String HARDWARE_FAILURE_DESCRIPTION = "hardwareFailureDescription";
     private final NodeFlavors nodeFlavors;
     private final Inspector inspector;
@@ -79,14 +78,7 @@ public class NodePatcher {
         List<Node> children = nodeRepository.getChildNodes(node.hostname());
         boolean modified = false;
 
-        // TODO: Remove when all clients have switched to hardwareFailureDescription
-        if (inspector.field(HARDWARE_FAILURE_TYPE).valid()) {
-            Optional<String> hardwareFailure = asOptionalString(inspector.field(HARDWARE_FAILURE_TYPE));
-            modified = true;
-            children = children.stream()
-                    .map(node -> node.with(node.status().withHardwareFailureDescription(hardwareFailure)))
-                    .collect(Collectors.toList());
-        } else if (inspector.field(HARDWARE_FAILURE_DESCRIPTION).valid()) {
+        if (inspector.field(HARDWARE_FAILURE_DESCRIPTION).valid()) {
             Optional<String> hardwareFailure = asOptionalString(inspector.field(HARDWARE_FAILURE_DESCRIPTION));
             modified = true;
             children = children.stream()
@@ -121,7 +113,6 @@ public class NodePatcher {
             case "flavor" :
                 return node.with(nodeFlavors.getFlavorOrThrow(asString(value)));
             case HARDWARE_FAILURE_DESCRIPTION:
-            case HARDWARE_FAILURE_TYPE:
                 return node.with(node.status().withHardwareFailureDescription(asOptionalString(value)));
             case "parentHostname" :
                 return node.withParentHostname(asString(value));
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 a7efc3ccd82..78bd2b5e165 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
@@ -168,8 +168,6 @@ class NodesResponse extends HttpResponse {
                 });
         object.setLong("failCount", node.status().failCount());
         object.setBool("hardwareFailure", node.status().hardwareFailureDescription().isPresent());
-        // TODO: Remove when all clients have switched to hardwareFailureDescription
-        node.status().hardwareFailureDescription().ifPresent(failure -> object.setString("hardwareFailureType", failure));
         node.status().hardwareFailureDescription().ifPresent(failure -> object.setString("hardwareFailureDescription", failure));
         object.setBool("wantToRetire", node.status().wantToRetire());
         object.setBool("wantToDeprovision", node.status().wantToDeprovision());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
index 38d3bf46028..5f81013d8e1 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
@@ -460,24 +460,6 @@ public class RestApiTest {
         assertHardwareFailure(new Request("http://localhost:8080/nodes/v2/node/dockerhost2.yahoo.com"), Optional.of(true));
     }
 
-    // TODO: Remove when all clients have switched to hardwareFailureDescription
-    @Test
-    public void test_hardware_patching_of_docker_host_using_old_field() throws Exception {
-        assertHardwareFailure(new Request("http://localhost:8080/nodes/v2/node/host5.yahoo.com"), Optional.of(false));
-        assertHardwareFailure(new Request("http://localhost:8080/nodes/v2/node/dockerhost2.yahoo.com"), Optional.of(false));
-
-        assertResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost2.yahoo.com",
-                        Utf8.toBytes("{" +
-                                "\"hardwareFailureType\": \"memory_mcelog\"" +
-                                "}"
-                        ),
-                        Request.Method.PATCH),
-                "{\"message\":\"Updated dockerhost2.yahoo.com\"}");
-
-        assertHardwareFailure(new Request("http://localhost:8080/nodes/v2/node/host5.yahoo.com"), Optional.of(true));
-        assertHardwareFailure(new Request("http://localhost:8080/nodes/v2/node/dockerhost2.yahoo.com"), Optional.of(true));
-    }
-
     @Test
     public void test_node_patch_to_remove_docker_ready_fields() throws Exception {
         assertResponse(new Request("http://localhost:8080/nodes/v2/node/host5.yahoo.com",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
index 1fa8feb4586..6106e25e75e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
@@ -38,7 +38,6 @@
   "convergedStateVersion": "6.43.0",
   "failCount": 0,
   "hardwareFailure": true,
-  "hardwareFailureType": "memory_mcelog",
   "hardwareFailureDescription": "memory_mcelog",
   "wantToRetire" : true,
   "wantToDeprovision" : true,