Revert "Do not use serializable NodeRepositoryNode internally in controller"

1 files changed, 20 insertions, 19 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
index a90c8a9593b..516c28ab5cd 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
@@ -15,6 +15,7 @@ import org.junit.Test;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import static com.yahoo.vespa.hosted.controller.maintenance.ResourceTagMaintainer.SHARED_HOST_APPLICATION;
 import static org.junit.Assert.assertEquals;
@@ -24,7 +25,7 @@ import static org.junit.Assert.assertEquals;
  */
 public class ResourceTagMaintainerTest {
 
-    private final ControllerTester tester = new ControllerTester();
+    final ControllerTester tester = new ControllerTester();
 
     @Test
     public void maintain() {
@@ -50,24 +51,24 @@ public class ResourceTagMaintainerTest {
     }
 
     public void setNodes(ZoneId zone) {
-        var hostA = Node.builder()
-                        .hostname(HostName.from("parentHostA." + zone.value()))
-                        .type(NodeType.host)
-                        .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default"))
-                        .exclusiveTo(ApplicationId.from("t1", "a1", "i1"))
-                        .build();
-        var nodeA = Node.builder()
-                        .hostname(HostName.from("hostA." + zone.value()))
-                        .type(NodeType.tenant)
-                        .parentHostname(HostName.from("parentHostA." + zone.value()))
-                        .owner(ApplicationId.from("tenant1", "app1", "default"))
-                        .build();
-        var hostB = Node.builder()
-                        .hostname(HostName.from("parentHostB." + zone.value()))
-                        .type(NodeType.host)
-                        .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default"))
-                        .build();
-        tester.configServer().nodeRepository().putNodes(zone, List.of(hostA, nodeA, hostB));
+        var hostA = new Node.Builder()
+                .hostname(HostName.from("parentHostA." + zone.value()))
+                .type(NodeType.host)
+                .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default"))
+                .exclusiveTo(ApplicationId.from("t1", "a1", "i1"))
+                .build();
+        var nodeA = new Node.Builder()
+                .hostname(HostName.from("hostA." + zone.value()))
+                .type(NodeType.tenant)
+                .parentHostname(HostName.from("parentHostA." + zone.value()))
+                .owner(ApplicationId.from("tenant1", "app1", "default"))
+                .build();
+        var hostB = new Node.Builder()
+                .hostname(HostName.from("parentHostB." + zone.value()))
+                .type(NodeType.host)
+                .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default"))
+                .build();
+        tester.configServer().nodeRepository().setNodes(zone, List.of(hostA, nodeA, hostB));
     }
 
 }