Created test to check currentDockerImage and vespaVersion resetting

4 files changed, 37 insertions, 1 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
index 123104a354f..6636e9580e5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
@@ -58,7 +58,7 @@ public class MockNodeRepository extends NodeRepository {
         nodes.add(node4);
 
         Node node5 = createNode("node5", "host5.yahoo.com", Optional.of("dockerhost"), new Configuration(flavors.getFlavorOrThrow("default")), Node.Type.tenant);
-        nodes.add(node5.setStatus(node5.status().setDockerImage("image-123")));
+        nodes.add(node5.setStatus(node5.status().setDockerImage("image-123").setVespaVersion(new Version("1.2.3"))));
 
         nodes.add(createNode("node6", "host6.yahoo.com", Optional.empty(), new Configuration(flavors.getFlavorOrThrow("default")), Node.Type.tenant));
         nodes.add(createNode("node7", "host7.yahoo.com", Optional.empty(), new Configuration(flavors.getFlavorOrThrow("default")), Node.Type.tenant));
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 da826b2c221..2ead88c3dd4 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
@@ -259,6 +259,20 @@ public class RestApiTest {
                        400, "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not set field 'currentRestartGeneration': Node is not allocated\"}");
     }
 
+    @Test
+    public void testNodePatchToRemoveDockerReadyFields() throws IOException {
+        assertResponse(new Request("http://localhost:8080/nodes/v2/node/host5.yahoo.com",
+                        Utf8.toBytes("{" +
+                                "\"currentVespaVersion\": \"\"," +
+                                "\"currentDockerImage\": \"\"" +
+                                "}"
+                        ),
+                        Request.Method.PATCH),
+                "{\"message\":\"Updated host5.yahoo.com\"}");
+
+        assertFile(new Request("http://localhost:8080/nodes/v2/node/host5.yahoo.com"), "node5-after-changes.json");
+    }
+
     /** Tests the rendering of each node separately to make it easier to find errors */
     @Test
     public void testSingleNodeRendering() throws IOException {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json
new file mode 100644
index 00000000000..017fe269fcc
--- /dev/null
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json
@@ -0,0 +1,21 @@
+{
+  "url": "http://localhost:8080/nodes/v2/node/host5.yahoo.com",
+  "id": "host5.yahoo.com",
+  "state": "failed",
+  "type": "tenant",
+  "hostname": "host5.yahoo.com",
+  "parentHostname":"dockerhost",
+  "openStackId": "node5",
+  "flavor": "default",
+  "minDiskAvailableGb":400.0,
+  "minMainMemoryAvailableGb":16.0,
+  "description":"Flavor-name-is-default",
+  "minCpuCores":2.0,
+  "canonicalFlavor": "default",
+  "environment":"env",
+  "rebootGeneration": 0,
+  "currentRebootGeneration": 0,
+  "failCount": 1,
+  "hardwareFailure" : false,
+  "history":[{"event":"readied","at":123},{"event":"failed","at":123}]
+}
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 ce4ffc3ec86..266818b7c3c 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
@@ -15,6 +15,7 @@
   "environment":"env",
   "rebootGeneration": 0,
   "currentRebootGeneration": 0,
+  "vespaVersion": "1.2.3",
   "currentDockerImage":"image-123",
   "failCount": 1,
   "hardwareFailure" : false,