Remove hardwareDivergence from node-repository REST API

4 files changed, 1 insertions, 37 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 ff53c58d136..8dcf3c260f5 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
@@ -137,8 +137,6 @@ public class NodePatcher {
                 return node.withWantToRetire(asBoolean(value), Agent.operator, clock.instant());
             case WANT_TO_DEPROVISION :
                 return node.with(node.status().withWantToDeprovision(asBoolean(value)));
-            case "hardwareDivergence" :
-                return node.with(node.status().withHardwareDivergence(removeQuotedNulls(asOptionalString(value))));
             case "reports" :
                 return nodeWithPatchedReports(node, value);
             case "openStackId" :
@@ -183,7 +181,6 @@ public class NodePatcher {
         });
 
         return node.with(reportsBuilder.build());
-
     }
 
     private Set<String> asStringSet(Inspector 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 969e64e5993..4ebd458aa15 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
@@ -185,7 +185,6 @@ class NodesResponse extends HttpResponse {
         toSlime(node.history(), object.setArray("history"));
         ipAddressesToSlime(node.ipAddresses(), object.setArray("ipAddresses"));
         ipAddressesToSlime(node.ipAddressPool().asSet(), object.setArray("additionalIpAddresses"));
-        node.status().hardwareDivergence().ifPresent(hardwareDivergence -> object.setString("hardwareDivergence", hardwareDivergence));
         node.reports().toSlime(object, "reports");
         node.modelName().ifPresent(modelName -> object.setString("modelName", modelName));
     }
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 7cc638a8263..729ded3234c 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
@@ -522,37 +522,6 @@ public class RestApiTest {
     }
 
     @Test
-    public void test_hardware_divergence_patching() throws Exception {
-        // Add report
-        assertResponse(new Request("http://localhost:8080/nodes/v2/node/host6.yahoo.com",
-                                   Utf8.toBytes("{\"hardwareDivergence\": \"{\\\"actualCpuCores\\\":2}\"}"),
-                                   Request.Method.PATCH),
-                       "{\"message\":\"Updated host6.yahoo.com\"}");
-        assertFile(new Request("http://localhost:8080/nodes/v2/node/host6.yahoo.com"), "node6-after-changes.json");
-
-        // Empty report is rejected
-        assertResponse(new Request("http://localhost:8080/nodes/v2/node/host6.yahoo.com",
-                                   Utf8.toBytes("{\"hardwareDivergence\": \"\"}"),
-                                   Request.Method.PATCH),
-                       400,
-                       "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not set field 'hardwareDivergence': Hardware divergence must be non-empty, but was ''\"}");
-
-        // Clear report
-        assertResponse(new Request("http://localhost:8080/nodes/v2/node/host6.yahoo.com",
-                                   Utf8.toBytes("{\"hardwareDivergence\": null}"),
-                                   Request.Method.PATCH),
-                       "{\"message\":\"Updated host6.yahoo.com\"}");
-        assertFile(new Request("http://localhost:8080/nodes/v2/node/host6.yahoo.com"), "node6.json");
-
-        // Clear on quoted "null" report
-        assertResponse(new Request("http://localhost:8080/nodes/v2/node/host6.yahoo.com",
-                        Utf8.toBytes("{\"hardwareDivergence\": \"null\"}"),
-                        Request.Method.PATCH),
-                "{\"message\":\"Updated host6.yahoo.com\"}");
-        assertFile(new Request("http://localhost:8080/nodes/v2/node/host6.yahoo.com"), "node6.json");
-    }
-
-    @Test
     public void test_reports_patching() throws IOException {
         // Add report
         assertResponse(new Request("http://localhost:8080/nodes/v2/node/host6.yahoo.com",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json
index 77d9587222f..6fa1ccdb6fc 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json
@@ -61,6 +61,5 @@
     "127.0.6.1",
     "::6:1"
   ],
-  "additionalIpAddresses": [],
-  "hardwareDivergence": "{\"actualCpuCores\":2}"
+  "additionalIpAddresses": []
 }