diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-03-14 15:49:15 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-03-20 13:13:55 +0100 |
| commit | c3b01e2355cbc847dac817c2b36ef3230500b10b (patch) | |
| tree | 397f3ce599df1c39fb113ab312ea6e27e5ce9b0b /node-repository | |
| parent | e31b9616921f9046a1fabbe9fca9cf3a5d535279 (diff) | |
Remove ignored fields
Diffstat (limited to 'node-repository')
2 files changed, 0 insertions, 12 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 730803708e7..b808921a713 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 @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.provision.restapi.v2; import com.yahoo.component.Version; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.NodeFlavors; -import com.yahoo.config.provision.NodeType; import com.yahoo.io.IOUtils; import com.yahoo.slime.Inspector; import com.yahoo.slime.Type; @@ -108,8 +107,6 @@ public class NodePatcher { private Node applyField(String name, Inspector value) { switch (name) { - case "convergedStateVersion" : - return node; // TODO: Ignored, can be removed when callers no longer include this field case "currentRebootGeneration" : return node.withCurrentRebootGeneration(asLong(value), nodeRepository.clock().instant()); case "currentRestartGeneration" : @@ -123,8 +120,6 @@ public class NodePatcher { return node.with(node.status().withVespaVersion(versionFromImage)); case "currentVespaVersion" : return node.with(node.status().withVespaVersion(Version.fromString(asString(value)))); - case "currentHostedVersion" : - return node; // TODO: Ignored, can be removed when callers no longer include this field case "failCount" : return node.with(node.status().setFailCount(asLong(value).intValue())); case "flavor" : 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 cbdd4dec3dc..dbf08597d6b 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 @@ -196,12 +196,6 @@ public class RestApiTest { Utf8.toBytes("{\"currentVespaVersion\": \"5.104.142\"}"), Request.Method.PATCH), "{\"message\":\"Updated host4.yahoo.com\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", - Utf8.toBytes("{\"currentHostedVersion\": \"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("{\"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("{\"hardwareFailureDescription\": \"memory_mcelog\"}"), Request.Method.PATCH), "{\"message\":\"Updated host4.yahoo.com\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", @@ -417,7 +411,6 @@ public class RestApiTest { "\"currentRebootGeneration\": 3," + "\"flavor\": \"medium-disk\"," + "\"currentVespaVersion\": \"5.104.142\"," + - "\"currentHostedVersion\": \"2.1.2408\"," + "\"hardwareFailureDescription\": \"memory_mcelog\"," + "\"failCount\": 0," + "\"parentHostname\": \"parent.yahoo.com\"" + |