diff options
Diffstat (limited to 'node-admin/src/test/java/com/yahoo/vespa/hosted')
3 files changed, 18 insertions, 28 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java index 77bc49ca596..c7aa79cca40 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java @@ -1,24 +1,23 @@ package com.yahoo.vespa.hosted.node.admin.configserver.noderepository; -import com.google.common.net.InetAddresses; import com.yahoo.vespa.hosted.node.admin.task.util.network.IPVersion; import org.junit.Assert; import org.junit.Test; -import java.net.InetAddress; import java.util.Arrays; import java.util.Collections; -import java.util.List; +import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; public class AclTest { private final Acl aclCommon = new Acl( - createPortList(1234, 453), + createPortSet(1234, 453), createTrustedNodes("192.1.2.2", "fb00::1", "fe80::2", "fe80::3")); private final Acl aclNoPorts = new Acl( - Collections.emptyList(), + Collections.emptySet(), createTrustedNodes("192.1.2.2", "fb00::1", "fe80::2")); @Test @@ -72,7 +71,7 @@ public class AclTest { @Test public void ipv6_rules_stable() { Acl aclCommonDifferentOrder = new Acl( - createPortList(453, 1234), + createPortSet(453, 1234), createTrustedNodes("fe80::2", "192.1.2.2", "fb00::1", "fe80::3")); for (IPVersion ipVersion: IPVersion.values()) { @@ -80,13 +79,13 @@ public class AclTest { } } - private List<Integer> createPortList(Integer... ports) { - return Arrays.asList(ports); + private Set<Integer> createPortSet(Integer... ports) { + return Stream.of(ports).collect(Collectors.toSet()); } - private List<InetAddress> createTrustedNodes(String... addresses) { + private Set<Acl.Node> createTrustedNodes(String... addresses) { return Arrays.stream(addresses) - .map(InetAddresses::forString) - .collect(Collectors.toList()); + .map(ipAddress -> new Acl.Node("hostname", ipAddress)) + .collect(Collectors.toSet()); } } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java index 9d5555e1f92..bc9e5d380a3 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.node.admin.maintenance.acl; -import com.google.common.net.InetAddresses; import com.yahoo.vespa.hosted.dockerapi.Container; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.dockerapi.DockerImage; @@ -16,13 +15,11 @@ import com.yahoo.vespa.hosted.node.admin.task.util.network.IPVersion; import org.junit.Before; import org.junit.Test; -import java.net.InetAddress; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -249,19 +246,17 @@ public class AclMaintainerTest { } private Map<String, Acl> makeAcl(String containerHostname, String portsCommaSeparated, String... addresses) { - Map<String, Acl> map = new HashMap<>(); + Acl.Builder aclBuilder = new Acl.Builder(); - List<Integer> ports = Arrays.stream(portsCommaSeparated.split(",")) + Arrays.stream(portsCommaSeparated.split(",")) .map(Integer::valueOf) - .collect(Collectors.toList()); - - List<InetAddress> hosts = Arrays.stream(addresses) - .map(InetAddresses::forString) - .collect(Collectors.toList()); + .forEach(aclBuilder::withTrustedPorts); - Acl acl = new Acl(ports, hosts); - map.put(containerHostname, acl); + Arrays.stream(addresses) + .forEach(address -> aclBuilder.withTrustedNode("hostname", address)); + Map<String, Acl> map = new HashMap<>(); + map.put(containerHostname, aclBuilder.build()); return map; } } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/IPTablesEditorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/IPTablesEditorTest.java index c32d02a0bda..2cd942c1372 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/IPTablesEditorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/IPTablesEditorTest.java @@ -1,6 +1,5 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.acl; -import com.google.common.net.InetAddresses; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.dockerapi.ProcessResult; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.Acl; @@ -9,8 +8,6 @@ import com.yahoo.vespa.hosted.node.admin.task.util.network.IPVersion; import org.junit.Assert; import org.junit.Test; -import java.util.Collections; - import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -24,8 +21,7 @@ public class IPTablesEditorTest { @Test public void filter_set_wanted_rules() { - - Acl acl = new Acl(Collections.singletonList(22), Collections.singletonList(InetAddresses.forString("3001::1"))); + Acl acl = new Acl.Builder().withTrustedPorts(22).withTrustedNode("hostname", "3001::1").build(); FilterTableLineEditor filterLineEditor = FilterTableLineEditor.from(acl, IPVersion.IPv6); String currentFilterTable = "-P INPUT ACCEPT\n" + |