Merge pull request #27998 from vespa-engine/freva/handle-all-cases

Handle default case and remove handling for provisioned state

2 files changed, 1 insertions, 15 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index c7c2686fde7..7fc248024c3 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -546,7 +546,6 @@ public class NodeAgentImpl implements NodeAgent {
                     suspendedInOrchestrator = false;
                 }
             }
-            case provisioned -> nodeRepository.setNodeState(context.hostname().value(), NodeState.ready);
             case dirty -> {
                 removeContainerIfNeededUpdateContainerState(context, container);
                 context.log(logger, "State is " + node.state() + ", will delete application storage and mark node as ready");
@@ -556,6 +555,7 @@ public class NodeAgentImpl implements NodeAgent {
                 updateNodeRepoWithCurrentAttributes(context, Optional.empty());
                 nodeRepository.setNodeState(context.hostname().value(), NodeState.ready);
             }
+            default -> throw ConvergenceException.ofError("Unexpected state " + node.state().name());
         }
     }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
index 0913e1d040a..ef4d6d849f6 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
@@ -487,20 +487,6 @@ public class NodeAgentImplTest {
     }
 
     @Test
-    void provisionedNodeIsMarkedAsReady() {
-        final NodeSpec node = nodeBuilder(NodeState.provisioned)
-                .wantedDockerImage(dockerImage)
-                .build();
-
-        NodeAgentContext context = createContext(node);
-        NodeAgentImpl nodeAgent = makeNodeAgent(null, false);
-        when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node));
-
-        nodeAgent.doConverge(context);
-        verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(NodeState.ready));
-    }
-
-    @Test
     void testRestartDeadContainerAfterNodeAdminRestart() {
         final NodeSpec node = nodeBuilder(NodeState.active)
                 .currentDockerImage(dockerImage).wantedDockerImage(dockerImage)