Create node builder

2 files changed, 4 insertions, 13 deletions

diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java
index f92f02f7908..edda5593e79 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java
@@ -59,17 +59,14 @@ public class IdentityDocumentGeneratorTest {
         Node parentNode = Node.create("ostkid",
                                       new IP.Config(Set.of("127.0.0.1"), Set.of()),
                                       parentHostname,
-                                      Optional.empty(),
-                                      Optional.empty(),
                                       new MockNodeFlavors().getFlavorOrThrow("default"),
-                                      Optional.empty(),
-                                      NodeType.host, Optional.empty());
+                                      NodeType.host).build();
         Node containerNode = Node.createDockerNode(Set.of("::1"),
                                                    containerHostname,
                                                    parentHostname,
                                                    new MockNodeFlavors().getFlavorOrThrow("default").resources(),
                                                    NodeType.tenant)
-                .with(allocation);
+                .allocation(allocation).build();
         NodeRepository nodeRepository = mock(NodeRepository.class);
         when(nodeRepository.getNode(eq(parentHostname))).thenReturn(Optional.of(parentNode));
         when(nodeRepository.getNode(eq(containerHostname))).thenReturn(Optional.of(containerNode));
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
index 5e965761874..c5dbd9dd7b2 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
@@ -224,14 +224,8 @@ public class InstanceValidatorTest {
         MockNodeFlavors flavors = new MockNodeFlavors();
         List<Node> nodeList = new ArrayList<>();
         for (int i = 0; i < num; i++) {
-            Node node = Node.create("foo" + i,
-                                    new IP.Config(Set.of("::1" + i, "::2" + i, "::3" + i), Set.of()),
-                                    "foo" + i,
-                                    Optional.empty(),
-                                    Optional.empty(),
-                                    flavors.getFlavorOrThrow("default"),
-                                    Optional.empty(),
-                                    NodeType.tenant, Optional.empty());
+            Node node = Node.create("foo" + i, new IP.Config(Set.of("::1" + i, "::2" + i, "::3" + i), Set.of()),
+                    "foo" + i, flavors.getFlavorOrThrow("default"), NodeType.tenant).build();
             nodeList.add(node);
         }
         return nodeList;