Allow Orchestrator to suspend node admin with no active nodes

2 files changed, 10 insertions, 1 deletions

diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java
index ab12e08cb86..d20d450c723 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java
@@ -41,7 +41,7 @@ public class HostSuspensionResource implements HostSuspensionApi {
             throw createWebApplicationException(message, Response.Status.BAD_REQUEST);
         }
         final List<String> hostnamesAsStrings = request.getHostnames();
-        if (hostnamesAsStrings == null || hostnamesAsStrings.isEmpty()) {
+        if (hostnamesAsStrings == null) {
             String message = "hostnames missing in request: " + request;
             log.log(LogLevel.DEBUG, message);
             throw createWebApplicationException(message, Response.Status.BAD_REQUEST);
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java
index fb046f978c7..81393a28ec9 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java
@@ -136,6 +136,15 @@ public class HostResourceTest {
     }
 
     @Test
+    public void returns_200_empty_batch() throws Exception {
+        HostSuspensionResource hostSuspensionResource = new HostSuspensionResource(alwaysAllowOrchestrator);
+        BatchHostSuspendRequest request =
+                new BatchHostSuspendRequest("parentHostname", Collections.emptyList());
+        BatchOperationResult response = hostSuspensionResource.suspendAll(request);
+        assertThat(response.success());
+    }
+
+    @Test
     public void throws_404_when_host_unknown() throws Exception {
         try {
             HostResource hostResource =