honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NetworkUtilsTests (#43295) (#43378) 

* Follow up to #42109:
   * Adjust test to only check that interface lookup by name works not actually lookup IPs which is brittle since virtual interfaces can be destroyed/created by Docker while the tests are running

Co-authored-by:  Jason Tedor <jason@tedor.me>
This commit is contained in:
Armin Braun 2019-06-19 21:23:09 +02:00 committed by GitHub
parent 1dde6ba1db
commit be42b2c70c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/elasticsearch/common/network/NetworkUtils.java
View File

@ -201,9 +201,13 @@ public abstract class NetworkUtils {
return filterAllAddresses(address -> true, "no up-and-running addresses found");
}
static Optional<NetworkInterface> maybeGetInterfaceByName(List<NetworkInterface> networkInterfaces, String name) {
return networkInterfaces.stream().filter(netIf -> name.equals(netIf.getName())).findFirst();
}
/** Returns addresses for the given interface (it must be marked up) */
static InetAddress[] getAddressesForInterface(String name) throws SocketException {
Optional<NetworkInterface> networkInterface = getInterfaces().stream().filter((netIf) -> name.equals(netIf.getName())).findFirst();
Optional<NetworkInterface> networkInterface = maybeGetInterfaceByName(getInterfaces(), name);
if (networkInterface.isPresent() == false) {
throw new IllegalArgumentException("No interface named '" + name + "' found, got " + getInterfaces());

30
server/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java
View File

@ -20,12 +20,15 @@
package org.elasticsearch.common.network;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.hamcrest.OptionalMatchers;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
/**
* Tests for network utils. Please avoid using any methods that cause DNS lookups!
@ -79,23 +82,14 @@ public class NetworkUtilsTests extends ESTestCase {
assertArrayEquals(new InetAddress[] { InetAddress.getByName("::1") }, NetworkUtils.filterIPV6(addresses));
}
/**
* Test that selecting by name is possible and properly matches the addresses on all interfaces and virtual
* interfaces.
*
* Note that to avoid that this test fails when interfaces are down or they do not have addresses assigned to them,
* they are ignored.
*/
public void testAddressInterfaceLookup() throws Exception {
for (NetworkInterface netIf : NetworkUtils.getInterfaces()) {
if (!netIf.isUp() || Collections.list(netIf.getInetAddresses()).isEmpty()) {
continue;
}
String name = netIf.getName();
InetAddress[] expectedAddresses = Collections.list(netIf.getInetAddresses()).toArray(new InetAddress[0]);
InetAddress[] foundAddresses = NetworkUtils.getAddressesForInterface(name);
assertArrayEquals(expectedAddresses, foundAddresses);
// test that selecting by name is possible
public void testMaybeGetInterfaceByName() throws Exception {
final List<NetworkInterface> networkInterfaces = NetworkUtils.getInterfaces();
for (NetworkInterface netIf : networkInterfaces) {
final Optional<NetworkInterface> maybeNetworkInterface =
NetworkUtils.maybeGetInterfaceByName(networkInterfaces, netIf.getName());
assertThat(maybeNetworkInterface, OptionalMatchers.isPresent());
assertThat(maybeNetworkInterface.get().getName(), equalTo(netIf.getName()));
}
}