diff options
author | gjoranv <gv@verizonmedia.com> | 2023-02-17 13:41:16 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2023-02-17 14:26:31 +0100 |
commit | 83b51daa3b9a979d202ebea537f29132783ea476 (patch) | |
tree | 3d522ff98239ad05927b68184b86d19cc26d7c17 /node-repository | |
parent | d0a29336502507e506c0846dc9ad79807d2200cf (diff) |
Implement getting exclave nodes in node repo client.
Diffstat (limited to 'node-repository')
3 files changed, 9 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java index d27bd3aea4a..3caefcdc69e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java @@ -110,7 +110,8 @@ public class MockNodeRepository extends NodeRepository { .cloudAccount(defaultCloudAccount).build()); // Emulate node in tenant account nodes.add(Node.create("node3", ipConfig(3), "host3.yahoo.com", resources(0.5, 48, 500, 1, fast, local), NodeType.tenant) - .cloudAccount(tenantAccount).build()); + .wireguardPubKey(WireguardKey.from("333344445555666677778888999900001111222211c=")) + .cloudAccount(tenantAccount).build()); Node node4 = Node.create("node4", ipConfig(4), "host4.yahoo.com", resources(1, 4, 100, 1, fast, local), NodeType.tenant) .parentHostname("dockerhost1.yahoo.com") .status(Status.initial() @@ -156,7 +157,9 @@ public class MockNodeRepository extends NodeRepository { flavors.getFlavorOrThrow("large"), NodeType.host).cloudAccount(defaultCloudAccount).build()); // Emulate host in tenant account nodes.add(Node.create("dockerhost2", ipConfig(101, 1, 3), "dockerhost2.yahoo.com", - flavors.getFlavorOrThrow("large"), NodeType.host).cloudAccount(tenantAccount).build()); + flavors.getFlavorOrThrow("large"), NodeType.host) + .wireguardPubKey(WireguardKey.from("000011112222333344445555666677778888999900c=")) + .cloudAccount(tenantAccount).build()); nodes.add(Node.create("dockerhost3", ipConfig(102, 1, 3), "dockerhost3.yahoo.com", flavors.getFlavorOrThrow("large"), NodeType.host).cloudAccount(defaultCloudAccount).build()); nodes.add(Node.create("dockerhost4", ipConfig(103, 1, 3), "dockerhost4.yahoo.com", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json index b39aba199b7..f7e02261065 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json @@ -98,5 +98,6 @@ "::101:3", "::101:4" ], - "cloudAccount": "777888999000" + "cloudAccount": "777888999000", + "wireguardPubkey":"000011112222333344445555666677778888999900c=" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json index 1c560c2f95b..aa45de1f3dd 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json @@ -50,5 +50,6 @@ "::3:1" ], "additionalIpAddresses": [], - "cloudAccount": "777888999000" + "cloudAccount": "777888999000", + "wireguardPubkey":"333344445555666677778888999900001111222211c=" } |