Test forgetting on docker host

2 files changed, 13 insertions, 7 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
index b46a940d8ff..75b1efb649e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
@@ -213,7 +213,7 @@ public class NodesV2ApiHandler extends LoggingRequestHandler {
             if (node.isEmpty()) throw new NotFoundException("No node with hostname '" + hostname + "'");
             if (node.get().state() == Node.State.deprovisioned) {
                 nodeRepository.forget(node.get());
-                return new MessageResponse("Permanently removed '" + hostname + "'");
+                return new MessageResponse("Permanently removed " + hostname);
             } else {
                 List<Node> removedNodes = nodeRepository.removeRecursively(hostname);
                 return new MessageResponse("Removed " + removedNodes.stream().map(Node::hostname).collect(Collectors.joining(", ")));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
index e7f6b315e8d..c16a3f3b3e0 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
@@ -154,11 +154,6 @@ public class NodesV2ApiTest {
                                    new byte[0], Request.Method.DELETE),
                        "{\"message\":\"Removed host8.yahoo.com\"}");
 
-        // ... and then forget it completely
-        assertResponse(new Request("http://localhost:8080/nodes/v2/node/host8.yahoo.com",
-                                   new byte[0], Request.Method.DELETE),
-                       "{\"message\":\"Permanently removed host8.yahoo.com\"}");
-
         // or, PUT a node in failed ...
         assertResponse(new Request("http://localhost:8080/nodes/v2/state/failed/test-node-pool-102-2",
                                    new byte[0], Request.Method.PUT),
@@ -178,7 +173,7 @@ public class NodesV2ApiTest {
         tester.assertResponse(new Request("http://localhost:8080/nodes/v2/node/test-node-pool-102-2",  new byte[0], Request.Method.GET),
                              404, "{\"error-code\":\"NOT_FOUND\",\"message\":\"No node with hostname 'test-node-pool-102-2'\"}");
 
-        // Put a host in failed and make sure it's children are also failed
+        // Put a host in failed and make sure its children are also failed
         assertResponse(new Request("http://localhost:8080/nodes/v2/state/failed/dockerhost1.yahoo.com", new byte[0], Request.Method.PUT),
                 "{\"message\":\"Moved dockerhost1.yahoo.com, host4.yahoo.com to failed\"}");
 
@@ -232,6 +227,17 @@ public class NodesV2ApiTest {
                 .suspend(new HostName("host4.yahoo.com"));
 
         assertFile(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com"), "node4-after-changes.json");
+
+        // move the docker host to deprovisioned
+        assertResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com",
+                                   new byte[0], Request.Method.DELETE),
+                       "{\"message\":\"Removed dockerhost1.yahoo.com\"}");
+        // ... and then forget it completely
+        assertResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com",
+                                   new byte[0], Request.Method.DELETE),
+                       "{\"message\":\"Permanently removed dockerhost1.yahoo.com\"}");
+
+
     }
 
     @Test