Add OS version fields to nodes API

5 files changed, 169 insertions, 1 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 31d9a606d91..910da4e90bf 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
@@ -114,6 +114,8 @@ public class NodePatcher {
             case "vespaVersion" :
             case "currentVespaVersion" :
                 return node.with(node.status().withVespaVersion(Version.fromString(asString(value))));
+            case "currentOsVersion" :
+                return node.with(node.status().withOsVersion(Version.fromString(asString(value))));
             case "failCount" :
                 return node.with(node.status().setFailCount(asLong(value).intValue()));
             case "flavor" :
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 99ebb3e517b..970871a4d05 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
@@ -169,6 +169,8 @@ class NodesResponse extends HttpResponse {
         }
         object.setLong("rebootGeneration", node.status().reboot().wanted());
         object.setLong("currentRebootGeneration", node.status().reboot().current());
+        node.status().osVersion().ifPresent(version -> object.setString("currentOsVersion", version.toFullString()));
+        nodeRepository.osVersions().targetFor(node.type()).ifPresent(version -> object.setString("wantedOsVersion", version.toFullString()));
         node.status().vespaVersion()
                 .filter(version -> !version.isEmpty())
                 .ifPresent(version -> {
@@ -231,7 +233,7 @@ class NodesResponse extends HttpResponse {
             path = path.substring(0, path.length()-1);
         int lastSlash = path.lastIndexOf("/");
         if (lastSlash < 0) return path;
-        return path.substring(lastSlash+1, path.length());
+        return path.substring(lastSlash+1);
     }
 
     private static Node.State stateFromString(String stateString) {
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 b0053b3e7e6..84eaae3809f 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
@@ -26,6 +26,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -580,6 +581,26 @@ public class RestApiTest {
                        "{\"message\":\"Set osVersion to 7.4.2 for nodes of type confighost\"}");
     }
 
+    @Test
+    public void test_os_version() throws Exception {
+        // Schedule OS upgrade
+        assertResponse(new Request("http://localhost:8080/nodes/v2/upgrade/host",
+                                   Utf8.toBytes("{\"osVersion\": \"7.5.2\"}"),
+                                   Request.Method.PATCH),
+                       "{\"message\":\"Set osVersion to 7.5.2 for nodes of type host\"}");
+
+        // Other node type does not return wanted OS version
+        Response r = container.handleRequest(new Request("http://localhost:8080/nodes/v2/node/host1.yahoo.com"));
+        assertFalse("Response omits wantedOsVersions field", r.getBodyAsString().contains("wantedOsVersion"));
+
+        // Node updates its node object after upgrading OS
+        assertResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com",
+                                   Utf8.toBytes("{\"currentOsVersion\": \"7.5.2\"}"),
+                                   Request.Method.PATCH),
+                       "{\"message\":\"Updated dockerhost1.yahoo.com\"}");
+        assertFile(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com"), "docker-node1-os-upgrade-complete.json");
+    }
+
     /** Tests the rendering of each node separately to make it easier to find errors */
     @Test
     public void test_single_node_rendering() throws Exception {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json
new file mode 100644
index 00000000000..2e8092012fb
--- /dev/null
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json
@@ -0,0 +1,72 @@
+{
+  "url": "http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com",
+  "id": "dockerhost1.yahoo.com",
+  "state": "active",
+  "type": "host",
+  "hostname": "dockerhost1.yahoo.com",
+  "openStackId": "dockerhost1",
+  "flavor": "large",
+  "canonicalFlavor": "large",
+  "minDiskAvailableGb": 1600.0,
+  "minMainMemoryAvailableGb": 32.0,
+  "description": "Flavor-name-is-large",
+  "minCpuCores": 4.0,
+  "fastDisk": true,
+  "environment": "BARE_METAL",
+  "owner": {
+    "tenant": "zoneapp",
+    "application": "zoneapp",
+    "instance": "zoneapp"
+  },
+  "membership": {
+    "clustertype": "container",
+    "clusterid": "node-admin",
+    "group": "0",
+    "index": 0,
+    "retired": false
+  },
+  "restartGeneration": 0,
+  "currentRestartGeneration": 0,
+  "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0",
+  "wantedVespaVersion": "6.42.0",
+  "allowedToBeDown": false,
+  "rebootGeneration": 1,
+  "currentRebootGeneration": 0,
+  "currentOsVersion": "7.5.2",
+  "wantedOsVersion": "7.5.2",
+  "failCount": 0,
+  "hardwareFailure": false,
+  "wantToRetire": false,
+  "wantToDeprovision": false,
+  "history": [
+    {
+      "event": "provisioned",
+      "at": 123,
+      "agent": "system"
+    },
+    {
+      "event": "readied",
+      "at": 123,
+      "agent": "system"
+    },
+    {
+      "event": "reserved",
+      "at": 123,
+      "agent": "application"
+    },
+    {
+      "event": "activated",
+      "at": 123,
+      "agent": "application"
+    }
+  ],
+  "ipAddresses": [
+    "::1",
+    "127.0.0.1"
+  ],
+  "additionalIpAddresses": [
+    "::2",
+    "::3",
+    "::4"
+  ]
+}
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json
new file mode 100644
index 00000000000..88bda7544d9
--- /dev/null
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json
@@ -0,0 +1,71 @@
+{
+  "url": "http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com",
+  "id": "dockerhost1.yahoo.com",
+  "state": "active",
+  "type": "host",
+  "hostname": "dockerhost1.yahoo.com",
+  "openStackId": "dockerhost1",
+  "flavor": "large",
+  "canonicalFlavor": "large",
+  "minDiskAvailableGb": 1600.0,
+  "minMainMemoryAvailableGb": 32.0,
+  "description": "Flavor-name-is-large",
+  "minCpuCores": 4.0,
+  "fastDisk": true,
+  "environment": "BARE_METAL",
+  "owner": {
+    "tenant": "zoneapp",
+    "application": "zoneapp",
+    "instance": "zoneapp"
+  },
+  "membership": {
+    "clustertype": "container",
+    "clusterid": "node-admin",
+    "group": "0",
+    "index": 0,
+    "retired": false
+  },
+  "restartGeneration": 0,
+  "currentRestartGeneration": 0,
+  "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0",
+  "wantedVespaVersion": "6.42.0",
+  "allowedToBeDown": false,
+  "rebootGeneration": 1,
+  "currentRebootGeneration": 0,
+  "wantedOsVersion": "7.5.2",
+  "failCount": 0,
+  "hardwareFailure": false,
+  "wantToRetire": false,
+  "wantToDeprovision": false,
+  "history": [
+    {
+      "event": "provisioned",
+      "at": 123,
+      "agent": "system"
+    },
+    {
+      "event": "readied",
+      "at": 123,
+      "agent": "system"
+    },
+    {
+      "event": "reserved",
+      "at": 123,
+      "agent": "application"
+    },
+    {
+      "event": "activated",
+      "at": 123,
+      "agent": "application"
+    }
+  ],
+  "ipAddresses": [
+    "::1",
+    "127.0.0.1"
+  ],
+  "additionalIpAddresses": [
+    "::2",
+    "::3",
+    "::4"
+  ]
+}