diff options
| author | Martin Polden <martin.polden@gmail.com> | 2017-03-01 14:51:00 +0100 |
|---|---|---|
| committer | Martin Polden <martin.polden@gmail.com> | 2017-03-06 11:19:18 +0100 |
| commit | 6afa2132894c4f70cc205a1f55f9642d8ffba0a0 (patch) | |
| tree | 3a40a4f6abce7fc70cb13b88487e0f742faabcb8 /node-repository | |
| parent | fc3b6392a82aa80358e5cf032ce06fc4c3cd78cd (diff) | |
Fix REST API TODO
Diffstat (limited to 'node-repository')
3 files changed, 4 insertions, 6 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 8ef63542a22..10adbfe1ee8 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 @@ -77,8 +77,6 @@ public class NodePatcher { return node.with(node.status().setFailCount(asLong(value).intValue())); case "flavor" : return node.with(nodeFlavors.getFlavorOrThrow(asString(value))); - case "hardwareFailure" : // TODO (Aug 2016): Remove support for this when mpolden says ok - return node.with(node.status().withHardwareFailure(toHardwareFailureType(asBoolean(value)))); case "hardwareFailureType" : return node.with(node.status().withHardwareFailure(toHardwareFailureType(asString(value)))); case "parentHostname" : 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 58a1f7ee21c..fa2a5150b4a 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 @@ -159,7 +159,7 @@ public class RestApiTest { Utf8.toBytes("{\"convergedStateVersion\": \"5.104.142-2.1.2408\"}"), Request.Method.PATCH), "{\"message\":\"Updated host4.yahoo.com\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", - Utf8.toBytes("{\"hardwareFailure\": true}"), Request.Method.PATCH), + Utf8.toBytes("{\"hardwareFailureType\": \"memory_mcelog\"}"), Request.Method.PATCH), "{\"message\":\"Updated host4.yahoo.com\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", Utf8.toBytes("{\"parentHostname\": \"parent.yahoo.com\"}"), Request.Method.PATCH), @@ -223,7 +223,7 @@ public class RestApiTest { Request.Method.POST), "{\"message\":\"Added 1 nodes to the provisioned state\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/host12.yahoo.com", - Utf8.toBytes("{\"hardwareFailure\": true}"), + Utf8.toBytes("{\"hardwareFailureType\": \"memory_mcelog\"}"), Request.Method.PATCH), "{\"message\":\"Updated host12.yahoo.com\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/state/failed/host12.yahoo.com", @@ -377,7 +377,7 @@ public class RestApiTest { "\"flavor\": \"medium-disk\"," + "\"currentVespaVersion\": \"5.104.142\"," + "\"currentHostedVersion\": \"2.1.2408\"," + - "\"hardwareFailure\": true," + + "\"hardwareFailureType\": \"memory_mcelog\"," + "\"failCount\": 0," + "\"parentHostname\": \"parent.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 a9922340449..eba522bb527 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 @@ -36,7 +36,7 @@ "convergedStateVersion": "5.104.142-2.1.2408", "failCount": 0, "hardwareFailure": true, - "hardwareFailureType":"unknown", + "hardwareFailureType": "memory_mcelog", "history": [ { "event": "readied", |