diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-08-09 14:57:29 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-08-09 14:57:29 +0200 |
| commit | 53842016403a8e4fffb5dc044994f2db4e92e55f (patch) | |
| tree | 325e02756ef3ca84f1a7bd2464f86f232fda7244 /node-repository | |
| parent | f2b47b0c6a3ee706b7fb9cc4cce78e17382b1613 (diff) | |
Remove unused version fields from nodes API
Diffstat (limited to 'node-repository')
5 files changed, 2 insertions, 13 deletions
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 716de252513..99ebb3e517b 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 @@ -174,9 +174,6 @@ class NodesResponse extends HttpResponse { .ifPresent(version -> { object.setString("vespaVersion", version.toFullString()); object.setString("currentDockerImage", nodeRepository.dockerImage().withTag(version).asString()); - // TODO: Remove these when they are no longer read - object.setString("hostedVersion", version.toFullString()); - object.setString("convergedStateVersion", version.toFullString()); }); object.setLong("failCount", node.status().failCount()); object.setBool("hardwareFailure", node.status().hardwareFailureDescription().isPresent()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json index 65e2b1435dc..fe65f34bae5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json @@ -35,8 +35,6 @@ "currentRebootGeneration": 0, "vespaVersion": "5.104.142", "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:5.104.142", - "hostedVersion": "5.104.142", - "convergedStateVersion": "5.104.142", "failCount": 0, "hardwareFailure": false, "wantToRetire": false, @@ -63,4 +61,4 @@ "127.0.0.1" ], "additionalIpAddresses": [] -}
\ No newline at end of file +} 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 9cec6d86421..86f31c5aa62 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 @@ -35,8 +35,6 @@ "currentRebootGeneration": 1, "vespaVersion": "6.43.0", "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.43.0", - "hostedVersion": "6.43.0", - "convergedStateVersion": "6.43.0", "failCount": 1, "hardwareFailure": true, "hardwareFailureDescription": "memory_mcelog", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json index 1b705a0ee8c..a2f72766d7f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json @@ -35,8 +35,6 @@ "currentRebootGeneration": 0, "vespaVersion": "6.41.0", "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.41.0", - "hostedVersion": "6.41.0", - "convergedStateVersion": "6.41.0", "failCount": 0, "hardwareFailure": false, "wantToRetire": false, @@ -68,4 +66,4 @@ "127.0.0.1" ], "additionalIpAddresses": [] -}
\ No newline at end of file +} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json index f8b9fb72e5e..ceb393f4bf6 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json @@ -18,8 +18,6 @@ "currentRebootGeneration": 0, "vespaVersion": "1.2.3", "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:1.2.3", - "hostedVersion": "1.2.3", - "convergedStateVersion": "1.2.3", "failCount": 1, "hardwareFailure": false, "wantToRetire": false, |