Rename to WireguardPeer

6 files changed, 30 insertions, 31 deletions

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 c06c9328998..f543416115b 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,7 +1,7 @@
 // Copyright Yahoo. 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.node.admin.wireguard.ConfigserverPeer;
+import com.yahoo.vespa.hosted.node.admin.wireguard.WireguardPeer;
 
 import java.util.List;
 import java.util.Map;
@@ -24,9 +24,9 @@ public interface NodeRepository {
 
     Map<String, Acl> getAcls(String hostname);
 
-    List<ConfigserverPeer> getExclavePeers();
+    List<WireguardPeer> getExclavePeers();
 
-    List<ConfigserverPeer> getConfigserverPeers();
+    List<WireguardPeer> getConfigserverPeers();
 
     void updateNodeAttributes(String hostName, NodeAttributes nodeAttributes);
 
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 7b888f1280c..1befb543201 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
@@ -18,7 +18,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.Ge
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.GetWireguardResponse;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.NodeRepositoryNode;
 import com.yahoo.vespa.hosted.node.admin.task.util.network.VersionedIpAddress;
-import com.yahoo.vespa.hosted.node.admin.wireguard.ConfigserverPeer;
+import com.yahoo.vespa.hosted.node.admin.wireguard.WireguardPeer;
 
 import java.net.URI;
 import java.time.Instant;
@@ -130,7 +130,7 @@ public class RealNodeRepository implements NodeRepository {
     }
 
     @Override
-    public List<ConfigserverPeer> getExclavePeers() {
+    public List<WireguardPeer> getExclavePeers() {
         String path = "/nodes/v2/node/?recursive=true&enclave=true";
         final GetNodesResponse response = configServerApi.get(path, GetNodesResponse.class);
 
@@ -141,11 +141,11 @@ public class RealNodeRepository implements NodeRepository {
     }
 
     @Override
-    public List<ConfigserverPeer> getConfigserverPeers() {
+    public List<WireguardPeer> getConfigserverPeers() {
         GetWireguardResponse response = configServerApi.get("/nodes/v2/wireguard", GetWireguardResponse.class);
         return response.configservers.stream()
                 .map(RealNodeRepository::createConfigserverPeer)
-                .sorted(Comparator.comparing(ConfigserverPeer::hostname))
+                .sorted(Comparator.comparing(WireguardPeer::hostname))
                 .toList();
     }
 
@@ -350,16 +350,16 @@ public class RealNodeRepository implements NodeRepository {
         return node;
     }
 
-    private static ConfigserverPeer createTenantPeer(NodeRepositoryNode node) {
-        return new ConfigserverPeer(HostName.of(node.hostname),
-                                    node.ipAddresses.stream().map(VersionedIpAddress::from).toList(),
-                                    node.wireguardKey());
+    private static WireguardPeer createTenantPeer(NodeRepositoryNode node) {
+        return new WireguardPeer(HostName.of(node.hostname),
+                                 node.ipAddresses.stream().map(VersionedIpAddress::from).toList(),
+                                 node.wireguardKey());
     }
 
-    private static ConfigserverPeer createConfigserverPeer(GetWireguardResponse.Configserver configServer) {
-        return new ConfigserverPeer(HostName.of(configServer.hostname),
-                                    configServer.ipAddresses.stream().map(VersionedIpAddress::from).toList(),
-                                    configServer.wireguardKey());
+    private static WireguardPeer createConfigserverPeer(GetWireguardResponse.Configserver configServer) {
+        return new WireguardPeer(HostName.of(configServer.hostname),
+                                 configServer.ipAddresses.stream().map(VersionedIpAddress::from).toList(),
+                                 configServer.wireguardKey());
     }
 
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/ConfigserverPeer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/WireguardPeer.java
index 510bdacfe0c..f3ee8f0eb7f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/ConfigserverPeer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/WireguardPeer.java
@@ -12,17 +12,17 @@ import java.util.Optional;
  *
  * @author gjoranv
  */
-public record ConfigserverPeer(HostName hostname,
-                               List<VersionedIpAddress> ipAddresses,
-                               Optional<WireguardKey> publicKey) implements Comparable<ConfigserverPeer> {
+public record WireguardPeer(HostName hostname,
+                            List<VersionedIpAddress> ipAddresses,
+                            Optional<WireguardKey> publicKey) implements Comparable<WireguardPeer> {
 
-    public ConfigserverPeer {
+    public WireguardPeer {
         if (ipAddresses.isEmpty()) throw new IllegalArgumentException("No IP addresses for peer node " + hostname.value());
         ipAddresses = ipAddresses.stream().sorted().toList();
     }
 
     @Override
-    public int compareTo(ConfigserverPeer o) {
+    public int compareTo(WireguardPeer o) {
         return hostname.value().compareTo(o.hostname.value());
     }
 
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 f47e8e63b79..0c2d18e974e 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
@@ -12,7 +12,7 @@ import com.yahoo.config.provision.host.FlavorOverrides;
 import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApi;
 import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApiImpl;
 import com.yahoo.vespa.hosted.node.admin.task.util.network.VersionedIpAddress;
-import com.yahoo.vespa.hosted.node.admin.wireguard.ConfigserverPeer;
+import com.yahoo.vespa.hosted.node.admin.wireguard.WireguardPeer;
 import com.yahoo.vespa.hosted.provision.restapi.NodesV2ApiHandler;
 import com.yahoo.vespa.hosted.provision.testutils.ContainerConfig;
 import org.junit.jupiter.api.AfterEach;
@@ -203,7 +203,7 @@ public class RealNodeRepositoryTest {
 
         //// Configservers ////
 
-        List<ConfigserverPeer> cfgPeers =  nodeRepositoryApi.getConfigserverPeers();
+        List<WireguardPeer> cfgPeers =  nodeRepositoryApi.getConfigserverPeers();
         assertEquals(2, cfgPeers.size());
 
         assertWireguardPeer(cfgPeers.get(0), "cfg1.yahoo.com",
@@ -216,7 +216,7 @@ public class RealNodeRepositoryTest {
 
         //// Exclave nodes ////
 
-        List<ConfigserverPeer> exclavePeers =  nodeRepositoryApi.getExclavePeers();
+        List<WireguardPeer> exclavePeers =  nodeRepositoryApi.getExclavePeers();
         System.out.println(exclavePeers);
         assertEquals(2, exclavePeers.size());
 
@@ -229,7 +229,7 @@ public class RealNodeRepositoryTest {
                             "333344445555666677778888999900001111222211c=");
     }
 
-    private void assertWireguardPeer(ConfigserverPeer peer, String hostname, String ipv6, String ipv4, String publicKey) {
+    private void assertWireguardPeer(WireguardPeer peer, String hostname, String ipv6, String ipv4, String publicKey) {
         assertEquals(hostname, peer.hostname().value());
         assertEquals(2, peer.ipAddresses().size());
         assertIp(peer.ipAddresses().get(0), ipv6, 6);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java
index 11033681177..3dab2f1e776 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java
@@ -8,14 +8,13 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttribu
 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.wireguard.ConfigserverPeer;
+import com.yahoo.vespa.hosted.node.admin.wireguard.WireguardPeer;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * Mock with some simple logic
@@ -48,12 +47,12 @@ public class NodeRepoMock implements NodeRepository {
     }
 
     @Override
-    public List<ConfigserverPeer> getExclavePeers() {
+    public List<WireguardPeer> getExclavePeers() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public List<ConfigserverPeer> getConfigserverPeers() {
+    public List<WireguardPeer> getConfigserverPeers() {
         throw new UnsupportedOperationException();
     }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/WireguardPeerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/WireguardPeerTest.java
index 113ee4ab86d..3264c9aa190 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/WireguardPeerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/WireguardPeerTest.java
@@ -17,7 +17,7 @@ public class WireguardPeerTest {
 
     @Test
     void peers_are_sorted_by_hostname_ascending() {
-        List<ConfigserverPeer> peers = Stream.of(
+        List<WireguardPeer> peers = Stream.of(
                 peer("b"),
                 peer("a"),
                 peer("c")
@@ -28,7 +28,7 @@ public class WireguardPeerTest {
         assertEquals("c", peers.get(2).hostname().value());
     }
 
-    private static ConfigserverPeer peer(String hostname) {
-        return new ConfigserverPeer(HostName.of(hostname), List.of(VersionedIpAddress.from("::1:1")), Optional.empty());
+    private static WireguardPeer peer(String hostname) {
+        return new WireguardPeer(HostName.of(hostname), List.of(VersionedIpAddress.from("::1:1")), Optional.empty());
     }
 }