aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin/src/test
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2023-02-18 16:13:45 +0100
committergjoranv <gv@verizonmedia.com>2023-02-18 16:13:45 +0100
commit623b2538aec3848facfb72abc4d7ba0f893ca686 (patch)
treebb0ba3cb0977a17d4b807a963765d9add5459610 /node-admin/src/test
parentcd78b3fa9684fd333edf07ea80c539bb82efff3f (diff)
Make wg key non-optional in WireguardPeer.
Diffstat (limited to 'node-admin/src/test')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/WireguardPeerTest.java5
2 files changed, 4 insertions, 3 deletions
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 c7eb26cb6a7..8d19925a886 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
@@ -229,7 +229,7 @@ public class RealNodeRepositoryTest {
assertEquals(2, peer.ipAddresses().size());
assertIp(peer.ipAddresses().get(0), ipv6, 6);
assertIp(peer.ipAddresses().get(1), ipv4, 4);
- assertEquals(publicKey, peer.publicKey().get().value());
+ assertEquals(publicKey, peer.publicKey().value());
}
private void assertIp(VersionedIpAddress ip, String expectedIp, int expectedVersion) {
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 3264c9aa190..00aca5c5e4d 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
@@ -1,11 +1,11 @@
package com.yahoo.vespa.hosted.node.admin.wireguard;
import com.yahoo.config.provision.HostName;
+import com.yahoo.config.provision.WireguardKey;
import com.yahoo.vespa.hosted.node.admin.task.util.network.VersionedIpAddress;
import org.junit.jupiter.api.Test;
import java.util.List;
-import java.util.Optional;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,6 +29,7 @@ public class WireguardPeerTest {
}
private static WireguardPeer peer(String hostname) {
- return new WireguardPeer(HostName.of(hostname), List.of(VersionedIpAddress.from("::1:1")), Optional.empty());
+ return new WireguardPeer(HostName.of(hostname), List.of(VersionedIpAddress.from("::1:1")),
+ WireguardKey.generateRandomForTesting());
}
}