diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java index 1c513e78de1..1f402876560 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.node; import com.yahoo.config.provision.CloudName; @@ -14,7 +14,6 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.Set; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,44 +35,6 @@ public class IPTest { } @Test - public void test_natural_order() { - Set<String> ipAddresses = Set.of( - "192.168.254.1", - "192.168.254.254", - "127.7.3.1", - "127.5.254.1", - "172.16.100.1", - "172.16.254.2", - "2001:db8:0:0:0:0:0:ffff", - "2001:db8:95a3:0:0:0:0:7334", - "2001:db8:85a3:0:0:8a2e:370:7334", - "::1", - "::10", - "::20"); - - assertEquals( - List.of( - "127.5.254.1", - "127.7.3.1", - "172.16.100.1", - "172.16.254.2", - "192.168.254.1", - "192.168.254.254", - "::1", - "::10", - "::20", - "2001:db8::ffff", - "2001:db8:85a3::8a2e:370:7334", - "2001:db8:95a3::7334"), - ipAddresses.stream() - .map(IP::parse) - .sorted(IP.NATURAL_ORDER) - .map(IP::asString) - .toList() - ); - } - - @Test public void test_find_allocation_ipv6_only() { IP.Pool pool = createNode(List.of( "::1", |