Depend on node-repository in test scope

20 files changed, 131 insertions, 100 deletions

diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index d550ceb7c9d..f9b00ada045 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -74,12 +74,6 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>node-repository</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
             <version>4.4.1</version>
@@ -135,6 +129,12 @@
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
+            <artifactId>node-repository</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
             <artifactId>service-monitor</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java
index 5fc82a70e80..354f4145ba4 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.configserver.noderepository;
 
-import com.yahoo.vespa.hosted.provision.Node;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -26,7 +24,7 @@ public interface NodeRepository {
 
     void updateNodeAttributes(String hostName, NodeAttributes nodeAttributes);
 
-    void setNodeState(String hostName, Node.State nodeState);
+    void setNodeState(String hostName, NodeState nodeState);
 
     void scheduleReboot(String hostname);
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
index 1127df2e413..35bcf2f2114 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.node.admin.configserver.noderepository;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.vespa.hosted.dockerapi.DockerImage;
-import com.yahoo.vespa.hosted.provision.Node;
 
 import java.time.Instant;
 import java.util.Collections;
@@ -17,7 +16,7 @@ import java.util.Set;
  */
 public class NodeSpec {
     private final String hostname;
-    private final Node.State state;
+    private final NodeState state;
     private final NodeType nodeType;
     private final String flavor;
     private final String canonicalFlavor;
@@ -64,7 +63,7 @@ public class NodeSpec {
             String hostname,
             Optional<DockerImage> wantedDockerImage,
             Optional<DockerImage> currentDockerImage,
-            Node.State state,
+            NodeState state,
             NodeType nodeType,
             String flavor,
             String canonicalFlavor,
@@ -129,7 +128,7 @@ public class NodeSpec {
         return hostname;
     }
 
-    public Node.State getState() {
+    public NodeState getState() {
         return state;
     }
 
@@ -361,7 +360,7 @@ public class NodeSpec {
         private String hostname;
         private Optional<DockerImage> wantedDockerImage = Optional.empty();
         private Optional<DockerImage> currentDockerImage = Optional.empty();
-        private Node.State state;
+        private NodeState state;
         private NodeType nodeType;
         private String flavor;
         private String canonicalFlavor;
@@ -442,7 +441,7 @@ public class NodeSpec {
             return this;
         }
 
-        public Builder state(Node.State state) {
+        public Builder state(NodeState state) {
             this.state = state;
             return this;
         }
@@ -617,7 +616,7 @@ public class NodeSpec {
             return currentDockerImage;
         }
 
-        public Node.State getState() {
+        public NodeState getState() {
             return state;
         }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeState.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeState.java
new file mode 100644
index 00000000000..e1765efef31
--- /dev/null
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeState.java
@@ -0,0 +1,13 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.node.admin.configserver.noderepository;
+
+/**
+ * All the states a node can be in the node-repository.
+ *
+ * See com.yahoo.vespa.hosted.provision.NodeState
+ *
+ * @author freva
+ */
+public enum NodeState {
+    provisioned, ready, reserved, active, inactive, dirty, failed, parked
+}
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
index 4806aa2790d..ad29222c8e3 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
@@ -13,7 +13,6 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.Ge
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.NodeMessageResponse;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.NodeRepositoryNode;
 import com.yahoo.vespa.hosted.node.admin.util.PrefixLogger;
-import com.yahoo.vespa.hosted.provision.Node;
 
 import java.time.Instant;
 import java.util.Collections;
@@ -133,7 +132,7 @@ public class RealNodeRepository implements NodeRepository {
     }
 
     @Override
-    public void setNodeState(String hostName, Node.State nodeState) {
+    public void setNodeState(String hostName, NodeState nodeState) {
         String state = nodeState.name();
         NodeMessageResponse response = configServerApi.put(
                 "/nodes/v2/state/" + state + "/" + hostName,
@@ -162,8 +161,8 @@ public class RealNodeRepository implements NodeRepository {
         NodeType nodeType = NodeType.valueOf(node.type);
 
         Objects.requireNonNull(node.state, "Unknown node state");
-        Node.State nodeState = Node.State.valueOf(node.state);
-        if (nodeState == Node.State.active) {
+        NodeState nodeState = NodeState.valueOf(node.state);
+        if (nodeState == NodeState.active) {
             Objects.requireNonNull(node.wantedVespaVersion, "Unknown vespa version for active node");
             Objects.requireNonNull(node.wantedDockerImage, "Unknown docker image for active node");
             Objects.requireNonNull(node.restartGeneration, "Unknown restartGeneration for active node");
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
index eb306036416..41c4544c533 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
@@ -5,12 +5,12 @@ import com.yahoo.concurrent.ThreadFactoryFactory;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.Acl;
-import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextFactory;
-import com.yahoo.vespa.hosted.provision.Node;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -125,7 +125,7 @@ public class NodeAdminStateUpdater {
             throw new ConvergenceException("NodeAdmin is not yet " + (wantFrozen ? "frozen" : "unfrozen"));
         }
 
-        boolean hostIsActiveInNR = nodeRepository.getNode(hostHostname).getState() == Node.State.active;
+        boolean hostIsActiveInNR = nodeRepository.getNode(hostHostname).getState() == NodeState.active;
         switch (wantedState) {
             case RESUMED:
                 if (hostIsActiveInNR) orchestrator.resume(hostHostname);
@@ -183,7 +183,7 @@ public class NodeAdminStateUpdater {
     private List<String> getNodesInActiveState() {
         return nodeRepository.getNodes(hostHostname)
                              .stream()
-                             .filter(node -> node.getState() == Node.State.active)
+                             .filter(node -> node.getState() == NodeState.active)
                              .map(NodeSpec::getHostname)
                              .collect(Collectors.toList());
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
index 804450f05ff..9ca19a76706 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
@@ -9,8 +9,8 @@ import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.node.admin.component.ZoneId;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.Acl;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.docker.DockerNetworking;
-import com.yahoo.vespa.hosted.provision.Node;
 
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
@@ -177,7 +177,7 @@ public class NodeAgentContextImpl implements NodeAgentContext {
         public Builder(String hostname) {
             this.nodeSpecBuilder
                     .hostname(hostname)
-                    .state(Node.State.active)
+                    .state(NodeState.active)
                     .nodeType(NodeType.tenant)
                     .flavor("d-2-8-50");
         }
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 4724a98dbb2..2cbe6e7722b 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
@@ -23,6 +23,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttribu
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeOwner;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.OrchestratorException;
 import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations;
@@ -31,7 +32,6 @@ import com.yahoo.vespa.hosted.node.admin.maintenance.acl.AclMaintainer;
 import com.yahoo.vespa.hosted.node.admin.maintenance.identity.AthenzCredentialsMaintainer;
 import com.yahoo.vespa.hosted.node.admin.nodeadmin.ConvergenceException;
 import com.yahoo.vespa.hosted.node.admin.util.SecretAgentCheckConfig;
-import com.yahoo.vespa.hosted.provision.Node;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -270,7 +270,7 @@ public class NodeAgentImpl implements NodeAgent {
     }
 
     private void restartServices(NodeAgentContext context, Container existingContainer) {
-        if (existingContainer.state.isRunning() && context.node().getState() == Node.State.active) {
+        if (existingContainer.state.isRunning() && context.node().getState() == NodeState.active) {
             context.log(logger, "Restarting services");
             // Since we are restarting the services we need to suspend the node.
             orchestratorSuspendNode(context);
@@ -309,8 +309,8 @@ public class NodeAgentImpl implements NodeAgent {
     }
 
     private Optional<String> shouldRemoveContainer(NodeSpec node, Container existingContainer) {
-        final Node.State nodeState = node.getState();
-        if (nodeState == Node.State.dirty || nodeState == Node.State.provisioned) {
+        final NodeState nodeState = node.getState();
+        if (nodeState == NodeState.dirty || nodeState == NodeState.provisioned) {
             return Optional.of("Node in state " + nodeState + ", container should no longer be running");
         }
         if (node.getWantedDockerImage().isPresent() && !node.getWantedDockerImage().get().equals(existingContainer.image)) {
@@ -348,7 +348,7 @@ public class NodeAgentImpl implements NodeAgent {
                 orchestratorSuspendNode(context);
 
                 try {
-                    if (context.node().getState() != Node.State.dirty) {
+                    if (context.node().getState() != NodeState.dirty) {
                         suspend();
                     }
                     stopServices();
@@ -497,7 +497,7 @@ public class NodeAgentImpl implements NodeAgent {
                 updateNodeRepoWithCurrentAttributes(context);
                 break;
             case provisioned:
-                nodeRepository.setNodeState(context.hostname().value(), Node.State.dirty);
+                nodeRepository.setNodeState(context.hostname().value(), NodeState.dirty);
                 break;
             case dirty:
                 removeContainerIfNeededUpdateContainerState(context, container);
@@ -505,7 +505,7 @@ public class NodeAgentImpl implements NodeAgent {
                 athenzCredentialsMaintainer.ifPresent(maintainer -> maintainer.clearCredentials(context));
                 storageMaintainer.archiveNodeStorage(context);
                 updateNodeRepoWithCurrentAttributes(context);
-                nodeRepository.setNodeState(context.hostname().value(), Node.State.ready);
+                nodeRepository.setNodeState(context.hostname().value(), NodeState.ready);
                 break;
             default:
                 throw new RuntimeException("UNKNOWN STATE " + node.getState().name());
@@ -697,7 +697,7 @@ public class NodeAgentImpl implements NodeAgent {
     // to allow the node admin to make decisions that depend on the docker image. Or, each docker image
     // needs to contain routines for drain and suspend. For many images, these can just be dummy routines.
     private void orchestratorSuspendNode(NodeAgentContext context) {
-        if (context.node().getState() != Node.State.active) return;
+        if (context.node().getState() != NodeState.active) return;
 
         context.log(logger, "Ask Orchestrator for permission to suspend node");
         orchestrator.suspend(context.hostname().value());
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeStateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeStateTest.java
new file mode 100644
index 00000000000..4a71d3bdbe8
--- /dev/null
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeStateTest.java
@@ -0,0 +1,25 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.node.admin.configserver.noderepository;
+
+import com.yahoo.vespa.hosted.provision.Node;
+import org.junit.Test;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author freva
+ */
+public class NodeStateTest {
+
+    @Test
+    public void is_equal_to_node_repository_states() {
+        Set<String> nodeRepositoryStates = Stream.of(Node.State.values()).map(Enum::name).collect(Collectors.toSet());
+        Set<String> nodeAdminStates = Stream.of(NodeState.values()).map(Enum::name).collect(Collectors.toSet());
+
+        assertEquals(nodeAdminStates, nodeRepositoryStates);
+    }
+}
\ No newline at end of file
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
index ac13775d6fa..566d2ecc444 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
@@ -8,7 +8,6 @@ import com.yahoo.config.provision.NodeType;
 import com.yahoo.vespa.hosted.dockerapi.DockerImage;
 import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApi;
 import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApiImpl;
-import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.testutils.ContainerConfig;
 import org.junit.After;
 import org.junit.Before;
@@ -107,7 +106,7 @@ public class RealNodeRepositoryTest {
         final NodeSpec node = containersToRun.get(0);
         assertThat(node.getHostname(), is("host4.yahoo.com"));
         assertThat(node.getWantedDockerImage().get(), is(new DockerImage("docker-registry.domain.tld:8080/dist/vespa:6.42.0")));
-        assertThat(node.getState(), is(Node.State.active));
+        assertThat(node.getState(), is(NodeState.active));
         assertThat(node.getWantedRestartGeneration().get(), is(0L));
         assertThat(node.getCurrentRestartGeneration().get(), is(0L));
         assertThat(node.getMinCpuCores(), is(0.2));
@@ -152,18 +151,18 @@ public class RealNodeRepositoryTest {
 
     @Test
     public void testMarkAsReady() {
-        nodeRepositoryApi.setNodeState("host5.yahoo.com", Node.State.dirty);
-        nodeRepositoryApi.setNodeState("host5.yahoo.com", Node.State.ready);
+        nodeRepositoryApi.setNodeState("host5.yahoo.com", NodeState.dirty);
+        nodeRepositoryApi.setNodeState("host5.yahoo.com", NodeState.ready);
 
         try {
-            nodeRepositoryApi.setNodeState("host4.yahoo.com", Node.State.ready);
+            nodeRepositoryApi.setNodeState("host4.yahoo.com", NodeState.ready);
             fail("Should not be allowed to be marked ready as it is not registered as provisioned, dirty, failed or parked");
         } catch (RuntimeException ignored) {
             // expected
         }
 
         try {
-            nodeRepositoryApi.setNodeState("host101.yahoo.com", Node.State.ready);
+            nodeRepositoryApi.setNodeState("host101.yahoo.com", NodeState.ready);
             fail("Expected failure because host101 does not exist");
         } catch (RuntimeException ignored) {
             // expected
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
index c7bc8f16477..ae22a54faa9 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
@@ -5,7 +5,7 @@ import com.yahoo.config.provision.NodeType;
 import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.dockerapi.DockerImage;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
-import com.yahoo.vespa.hosted.provision.Node;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import org.junit.Test;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -28,7 +28,7 @@ public class DockerFailTest {
                     .hostname(hostname)
                     .wantedDockerImage(dockerImage)
                     .currentDockerImage(dockerImage)
-                    .state(Node.State.active)
+                    .state(NodeState.active)
                     .nodeType(NodeType.tenant)
                     .flavor("docker")
                     .wantedRestartGeneration(1L)
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index 6ae373e8b55..32e6aadaba3 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -10,6 +10,7 @@ import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.hosted.dockerapi.Docker;
 import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator;
 import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations;
 import com.yahoo.vespa.hosted.node.admin.docker.DockerOperationsImpl;
@@ -21,7 +22,6 @@ import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentFactory;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentImpl;
 import com.yahoo.vespa.hosted.node.admin.task.util.network.IPAddressesMock;
-import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.test.file.TestFileSystem;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
@@ -81,7 +81,7 @@ public class DockerTester implements AutoCloseable {
 
         NodeSpec hostSpec = new NodeSpec.Builder()
                 .hostname(HOST_HOSTNAME.value())
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .nodeType(NodeType.host)
                 .flavor("default")
                 .wantedRestartGeneration(1L)
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
index 16c9239dcd7..9cb89ae95ce 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
@@ -6,7 +6,7 @@ import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.dockerapi.DockerImage;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttributes;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
-import com.yahoo.vespa.hosted.provision.Node;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import org.junit.Test;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -27,7 +27,7 @@ public class MultiDockerTest {
 
             tester.addChildNodeRepositoryNode(
                     new NodeSpec.Builder(nodeSpec2)
-                            .state(Node.State.dirty)
+                            .state(NodeState.dirty)
                             .minCpuCores(1)
                             .minMainMemoryAvailableGb(1)
                             .minDiskAvailableGb(1)
@@ -36,7 +36,7 @@ public class MultiDockerTest {
             tester.inOrder(tester.docker).deleteContainer(eq(new ContainerName("host2")));
             tester.inOrder(tester.storageMaintainer).archiveNodeStorage(
                     argThat(context -> context.containerName().equals(new ContainerName("host2"))));
-            tester.inOrder(tester.nodeRepository).setNodeState(eq(nodeSpec2.getHostname()), eq(Node.State.ready));
+            tester.inOrder(tester.nodeRepository).setNodeState(eq(nodeSpec2.getHostname()), eq(NodeState.ready));
 
             addAndWaitForNode(tester, "host3.test.yahoo.com", new DockerImage("image1"));
         }
@@ -46,7 +46,7 @@ public class MultiDockerTest {
         NodeSpec nodeSpec = new NodeSpec.Builder()
                 .hostname(hostName)
                 .wantedDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .nodeType(NodeType.tenant)
                 .flavor("docker")
                 .wantedRestartGeneration(1L)
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java
index 5748d4034eb..ea4e2e4f6eb 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java
@@ -6,7 +6,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.AddNode;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttributes;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
-import com.yahoo.vespa.hosted.provision.Node;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -59,7 +59,7 @@ public class NodeRepoMock implements NodeRepository {
     }
 
     @Override
-    public void setNodeState(String hostName, Node.State nodeState) {
+    public void setNodeState(String hostName, NodeState nodeState) {
         synchronized (monitor) {
             updateNodeRepositoryNode(new NodeSpec.Builder(getNode(hostName))
                     .state(nodeState)
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
index 295368e0426..a1610ae4da3 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
@@ -3,11 +3,10 @@ package com.yahoo.vespa.hosted.node.admin.integrationTests;
 
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.vespa.hosted.dockerapi.ContainerName;
-import com.yahoo.vespa.hosted.dockerapi.ContainerResources;
 import com.yahoo.vespa.hosted.dockerapi.DockerImage;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminStateUpdater;
-import com.yahoo.vespa.hosted.provision.Node;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -51,7 +50,7 @@ public class RebootTest {
         return new NodeSpec.Builder()
                 .hostname(hostname)
                 .wantedDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .nodeType(NodeType.tenant)
                 .flavor("docker")
                 .vespaVersion("6.50.0")
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
index f9f455cca79..ff2f15efd0b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
@@ -6,7 +6,7 @@ import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.dockerapi.DockerImage;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttributes;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
-import com.yahoo.vespa.hosted.provision.Node;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import org.junit.Test;
 
 import static com.yahoo.vespa.hosted.node.admin.integrationTests.DockerTester.NODE_PROGRAM;
@@ -28,7 +28,7 @@ public class RestartTest {
 
             tester.addChildNodeRepositoryNode(new NodeSpec.Builder()
                     .hostname(hostname)
-                    .state(Node.State.active)
+                    .state(NodeState.active)
                     .wantedDockerImage(dockerImage)
                     .nodeType(NodeType.tenant)
                     .flavor("docker")
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
index a5cbeaa0222..85562a92af9 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
@@ -10,13 +10,13 @@ import com.yahoo.vespa.hosted.node.admin.component.ZoneId;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeMembership;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeOwner;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl;
 import com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder;
 import com.yahoo.vespa.hosted.node.admin.task.util.file.UnixPath;
 import com.yahoo.vespa.hosted.node.admin.task.util.process.TestTerminal;
-import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.test.file.TestFileSystem;
 import org.junit.After;
 import org.junit.Test;
@@ -157,7 +157,7 @@ public class StorageMaintainerTest {
             NodeSpec nodeSpec = new NodeSpec.Builder()
                     .hostname("host123-5.test.domain.tld")
                     .nodeType(nodeType)
-                    .state(Node.State.active)
+                    .state(NodeState.active)
                     .parentHostname("host123.test.domain.tld")
                     .owner(new NodeOwner("tenant", "application", "instance"))
                     .membership(new NodeMembership("clusterType", "clusterId", null, 0, false))
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
index 2f835a535ff..3fcb08e6680 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
@@ -6,10 +6,10 @@ import com.yahoo.metrics.simple.MetricReceiver;
 import com.yahoo.test.ManualClock;
 import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextFactory;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl;
-import com.yahoo.vespa.hosted.provision.Node;
 import org.junit.Test;
 import org.mockito.InOrder;
 
@@ -19,6 +19,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminImpl.NodeAgentWithScheduler;
+import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminImpl.NodeAgentWithSchedulerFactory;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -32,9 +34,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminImpl.NodeAgentWithScheduler;
-import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminImpl.NodeAgentWithSchedulerFactory;
-
 /**
  * @author bakksjo
  */
@@ -163,7 +162,7 @@ public class NodeAdminImplTest {
     private NodeAgentContext createNodeAgentContext(String hostname) {
         NodeSpec nodeSpec = new NodeSpec.Builder()
                 .hostname(hostname)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .nodeType(NodeType.tenant)
                 .flavor("default")
                 .build();
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
index 2387c279672..b8894bbf814 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
@@ -5,11 +5,11 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.test.ManualClock;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.Acl;
-import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextFactory;
-import com.yahoo.vespa.hosted.provision.Node;
 import org.junit.Test;
 
 import java.time.Duration;
@@ -57,7 +57,7 @@ public class NodeAdminStateUpdaterTest {
 
     @Test
     public void state_convergence() {
-        mockNodeRepo(Node.State.active, 4);
+        mockNodeRepo(NodeState.active, 4);
         List<String> activeHostnames = nodeRepository.getNodes(hostHostname.value()).stream()
                 .map(NodeSpec::getHostname)
                 .collect(Collectors.toList());
@@ -115,7 +115,7 @@ public class NodeAdminStateUpdaterTest {
     @Test
     public void half_transition_revert() {
         final String exceptionMsg = "Cannot allow to suspend because some reason";
-        mockNodeRepo(Node.State.active, 3);
+        mockNodeRepo(NodeState.active, 3);
 
         // Initially everything is frozen to force convergence
         when(nodeAdmin.setFrozen(eq(false))).thenReturn(true);
@@ -158,7 +158,7 @@ public class NodeAdminStateUpdaterTest {
     public void do_not_orchestrate_host_when_not_active() {
         when(nodeAdmin.subsystemFreezeDuration()).thenReturn(Duration.ofHours(1));
         when(nodeAdmin.setFrozen(anyBoolean())).thenReturn(true);
-        mockNodeRepo(Node.State.ready, 3);
+        mockNodeRepo(NodeState.ready, 3);
 
         // Resume and suspend only require that node-agents are frozen and permission from
         // orchestrator to resume/suspend host. Therefore, if host is not active, we only need to freeze.
@@ -178,7 +178,7 @@ public class NodeAdminStateUpdaterTest {
 
     @Test
     public void uses_cached_acl() {
-        mockNodeRepo(Node.State.active, 1);
+        mockNodeRepo(NodeState.active, 1);
         mockAcl(Acl.EMPTY, 1);
 
         updater.adjustNodeAgentsToRunFromNodeRepository();
@@ -199,7 +199,7 @@ public class NodeAdminStateUpdaterTest {
     @Test
     public void node_spec_and_acl_aligned() {
         Acl acl = new Acl.Builder().withTrustedPorts(22).build();
-        mockNodeRepo(Node.State.active, 3);
+        mockNodeRepo(NodeState.active, 3);
         mockAcl(acl, 1, 2, 3);
 
         updater.adjustNodeAgentsToRunFromNodeRepository();
@@ -216,11 +216,11 @@ public class NodeAdminStateUpdaterTest {
     @Test
     public void node_spec_and_acl_mismatch_missing_one_acl() {
         Acl acl = new Acl.Builder().withTrustedPorts(22).build();
-        mockNodeRepo(Node.State.active, 3);
+        mockNodeRepo(NodeState.active, 3);
         mockAcl(acl, 1, 2); // Acl for 3 is missing
 
         updater.adjustNodeAgentsToRunFromNodeRepository();
-        mockNodeRepo(Node.State.active, 2); // Next tick, the spec for 3 is no longer returned
+        mockNodeRepo(NodeState.active, 2); // Next tick, the spec for 3 is no longer returned
         updater.adjustNodeAgentsToRunFromNodeRepository();
         updater.adjustNodeAgentsToRunFromNodeRepository();
 
@@ -234,7 +234,7 @@ public class NodeAdminStateUpdaterTest {
     @Test
     public void node_spec_and_acl_mismatch_additional_acl() {
         Acl acl = new Acl.Builder().withTrustedPorts(22).build();
-        mockNodeRepo(Node.State.active, 2);
+        mockNodeRepo(NodeState.active, 2);
         mockAcl(acl, 1, 2, 3); // Acl for 3 is extra
 
         updater.adjustNodeAgentsToRunFromNodeRepository();
@@ -256,11 +256,11 @@ public class NodeAdminStateUpdaterTest {
         }
     }
 
-    private void mockNodeRepo(Node.State hostState, int numberOfNodes) {
+    private void mockNodeRepo(NodeState hostState, int numberOfNodes) {
         List<NodeSpec> containersToRun = IntStream.range(1, numberOfNodes + 1)
                 .mapToObj(i -> new NodeSpec.Builder()
                         .hostname("host" + i + ".yahoo.com")
-                        .state(Node.State.active)
+                        .state(NodeState.active)
                         .nodeType(NodeType.tenant)
                         .flavor("docker")
                         .minCpuCores(1)
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 227fa8f9199..3130500c940 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
@@ -18,6 +18,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeMembers
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeOwner;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
+import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.OrchestratorException;
 import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations;
@@ -25,7 +26,6 @@ import com.yahoo.vespa.hosted.node.admin.maintenance.StorageMaintainer;
 import com.yahoo.vespa.hosted.node.admin.maintenance.acl.AclMaintainer;
 import com.yahoo.vespa.hosted.node.admin.maintenance.identity.AthenzCredentialsMaintainer;
 import com.yahoo.vespa.hosted.node.admin.nodeadmin.ConvergenceException;
-import com.yahoo.vespa.hosted.provision.Node;
 import org.junit.Test;
 import org.mockito.InOrder;
 
@@ -92,7 +92,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion)
                 .build();
@@ -121,7 +121,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion)
                 .build();
@@ -142,7 +142,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion)
                 .build();
@@ -178,7 +178,7 @@ public class NodeAgentImplTest {
         final Optional<Long> restartGeneration = Optional.of(1L);
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .wantedRestartGeneration(restartGeneration.get())
                 .currentRestartGeneration(restartGeneration.get())
@@ -215,7 +215,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(newDockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion)
                 .build();
@@ -242,7 +242,7 @@ public class NodeAgentImplTest {
         NodeSpec.Builder specBuilder = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion);
 
@@ -289,7 +289,7 @@ public class NodeAgentImplTest {
         NodeSpec.Builder specBuilder = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion);
 
@@ -326,7 +326,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion)
                 .wantedRestartGeneration(wantedRestartGeneration)
@@ -355,7 +355,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion)
                 .wantedRebootGeneration(wantedRebootGeneration)
@@ -398,7 +398,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.failed)
+                .state(NodeState.failed)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion)
                 .build();
@@ -418,7 +418,7 @@ public class NodeAgentImplTest {
     @Test
     public void readyNodeLeadsToNoAction() {
         final NodeSpec node = nodeBuilder
-                .state(Node.State.ready)
+                .state(NodeState.ready)
                 .build();
 
         NodeAgentContext context = createContext(node);
@@ -444,7 +444,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.inactive)
+                .state(NodeState.inactive)
                 .wantedVespaVersion(vespaVersion)
                 .vespaVersion(vespaVersion)
                 .build();
@@ -467,7 +467,7 @@ public class NodeAgentImplTest {
     public void reservedNodeDoesNotUpdateNodeRepoWithVersion() {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
-                .state(Node.State.reserved)
+                .state(NodeState.reserved)
                 .wantedVespaVersion(vespaVersion)
                 .build();
 
@@ -481,7 +481,7 @@ public class NodeAgentImplTest {
         verify(nodeRepository, never()).updateNodeAttributes(eq(hostName), any());
     }
 
-    private void nodeRunningContainerIsTakenDownAndCleanedAndRecycled(Node.State nodeState, Optional<Long> wantedRestartGeneration) {
+    private void nodeRunningContainerIsTakenDownAndCleanedAndRecycled(NodeState nodeState, Optional<Long> wantedRestartGeneration) {
         wantedRestartGeneration.ifPresent(restartGeneration -> nodeBuilder
                 .wantedRestartGeneration(restartGeneration)
                 .currentRestartGeneration(restartGeneration));
@@ -504,7 +504,7 @@ public class NodeAgentImplTest {
         inOrder.verify(storageMaintainer, times(1)).handleCoreDumpsForContainer(eq(context), any());
         inOrder.verify(dockerOperations, times(1)).removeContainer(eq(context), any());
         inOrder.verify(storageMaintainer, times(1)).archiveNodeStorage(eq(context));
-        inOrder.verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(Node.State.ready));
+        inOrder.verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(NodeState.ready));
 
         verify(dockerOperations, never()).createContainer(eq(context), any());
         verify(dockerOperations, never()).startContainer(eq(context));
@@ -519,19 +519,19 @@ public class NodeAgentImplTest {
 
     @Test
     public void dirtyNodeRunningContainerIsTakenDownAndCleanedAndRecycled() {
-        nodeRunningContainerIsTakenDownAndCleanedAndRecycled(Node.State.dirty, Optional.of(1L));
+        nodeRunningContainerIsTakenDownAndCleanedAndRecycled(NodeState.dirty, Optional.of(1L));
     }
 
     @Test
     public void dirtyNodeRunningContainerIsTakenDownAndCleanedAndRecycledNoRestartGeneration() {
-        nodeRunningContainerIsTakenDownAndCleanedAndRecycled(Node.State.dirty, Optional.empty());
+        nodeRunningContainerIsTakenDownAndCleanedAndRecycled(NodeState.dirty, Optional.empty());
     }
 
     @Test
     public void provisionedNodeIsMarkedAsDirty() {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
-                .state(Node.State.provisioned)
+                .state(NodeState.provisioned)
                 .build();
 
         NodeAgentContext context = createContext(node);
@@ -539,7 +539,7 @@ public class NodeAgentImplTest {
         when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node));
 
         nodeAgent.doConverge(context);
-        verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(Node.State.dirty));
+        verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(NodeState.dirty));
     }
 
     @Test
@@ -547,7 +547,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .currentDockerImage(dockerImage)
                 .wantedDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .vespaVersion(vespaVersion)
                 .build();
 
@@ -569,7 +569,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .vespaVersion(vespaVersion)
                 .build();
 
@@ -605,7 +605,7 @@ public class NodeAgentImplTest {
     public void start_container_subtask_failure_leads_to_container_restart() {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .build();
 
@@ -658,7 +658,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .wantedDockerImage(dockerImage)
                 .currentDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .vespaVersion(vespaVersion)
                 .owner(owner)
                 .membership(membership)
@@ -705,7 +705,7 @@ public class NodeAgentImplTest {
     @Test
     public void testGetRelevantMetricsForReadyNode() {
         final NodeSpec node = nodeBuilder
-                .state(Node.State.ready)
+                .state(NodeState.ready)
                 .build();
 
         NodeAgentContext context = createContext(node);
@@ -724,7 +724,7 @@ public class NodeAgentImplTest {
         final NodeSpec node = nodeBuilder
                 .nodeType(NodeType.config)
                 .wantedDockerImage(dockerImage)
-                .state(Node.State.active)
+                .state(NodeState.active)
                 .wantedVespaVersion(vespaVersion)
                 .build();