diff options
| author | gjoranv <gv@verizonmedia.com> | 2023-02-18 15:39:59 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2023-02-18 15:39:59 +0100 |
| commit | cd78b3fa9684fd333edf07ea80c539bb82efff3f (patch) | |
| tree | a6a514ae3d750bcd693a1b1b316465b77ff6ad61 /node-admin | |
| parent | c9e4cc5668b7c844ce691db75b3b84808529ad3f (diff) | |
Filter exclave nodes without wg key from node repo client.
Diffstat (limited to 'node-admin')
2 files changed, 5 insertions, 5 deletions
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 1befb543201..a115e40a290 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 @@ -135,6 +135,7 @@ public class RealNodeRepository implements NodeRepository { final GetNodesResponse response = configServerApi.get(path, GetNodesResponse.class); return response.nodes.stream() + .filter(node -> node.wireguardPubkey != null && ! node.wireguardPubkey.isEmpty()) .map(RealNodeRepository::createTenantPeer) .sorted() .toList(); 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 47d37fe37fe..c7eb26cb6a7 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 @@ -204,6 +204,7 @@ public class RealNodeRepositoryTest { //// Configservers //// List<WireguardPeer> cfgPeers = nodeRepositoryApi.getConfigserverPeers(); + // cfg2 does not have a wg public key, so should not be included assertEquals(1, cfgPeers.size()); @@ -214,15 +215,13 @@ public class RealNodeRepositoryTest { //// Exclave nodes //// List<WireguardPeer> exclavePeers = nodeRepositoryApi.getExclavePeers(); - assertEquals(2, exclavePeers.size()); + + // host3 does not have a wg public key, so should not be included + assertEquals(1, exclavePeers.size()); assertWireguardPeer(exclavePeers.get(0), "dockerhost2.yahoo.com", "::101:1", "127.0.101.1", "000011112222333344445555666677778888999900c="); - - assertWireguardPeer(exclavePeers.get(1), "host3.yahoo.com", - "::3:1", "127.0.3.1", - "333344445555666677778888999900001111222211c="); } private void assertWireguardPeer(WireguardPeer peer, String hostname, String ipv6, String ipv4, String publicKey) { |