Don't rely on localhost4 and localhost6 hostnames (#15)

Use directly the IPs for localhost4 and localhost6 - so the test
named "testMultipleEndpoints" will run correctly host, which do
not define these names.

Signed-off-by: Tino Reichardt <tino.reichardt@desy.de>

Author: mcmilk

src/test/java/org/dcache/nearline/cta/CtaNearlineStorageTest.java

@@ -26,6 +26,8 @@
 import diskCacheV111.vehicles.GenericStorageInfo;
 import java.io.File;
 import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.net.URI;
@@ -671,27 +673,30 @@ public void testFailOnLostDeleteMessage() {
         verify(request, times(1)).failed(any(CacheException.class));
     }
 
-
     @Test
     public void testMultipleEndpoints() throws SocketException {
 
-        assumeTrue("localhost has only one IP address",
-                NetworkInterface.getByName("lo").getInterfaceAddresses().size() > 1);
+        var lo = NetworkInterface.getByName("lo");
+        boolean hasIPv4 = lo.getInterfaceAddresses().stream()
+                .anyMatch(a -> a.getAddress() instanceof Inet4Address);
+        boolean hasIPv6 = lo.getInterfaceAddresses().stream()
+                .anyMatch(a -> a.getAddress() instanceof Inet6Address);
+        assumeTrue("localhost needs both IPv4 and IPv6 for this test",
+                 hasIPv4 && hasIPv6);
 
-        var request = mockedStageRequest();
         driver = new CtaNearlineStorage("foo", "bar");
 
         var servicePort = cta.getServicePort();
-        drvConfig.put(CTA_ENDPOINT, "localhost4:" + servicePort + "," + "localhost6:" + servicePort);
+        drvConfig.put(CTA_ENDPOINT, "127.0.0.1:" + servicePort + ",[::1]:" + servicePort);
 
         driver.configure(drvConfig);
         driver.start();
 
         // invoice some to trigger load balancing
-        driver.stage(Set.of(request));
-        driver.stage(Set.of(request));
-        driver.stage(Set.of(request));
-        driver.stage(Set.of(request));
+        driver.stage(Set.of(mockedStageRequest()));
+        driver.stage(Set.of(mockedStageRequest()));
+        driver.stage(Set.of(mockedStageRequest()));
+        driver.stage(Set.of(mockedStageRequest()));
 
         assertTrue("Load balancing is not used", cta.getRequestsEndpoints().size() > 1);
     }
@@ -800,4 +805,4 @@ private RemoveRequest mockedRemoveRequest() {
         return request;
     }
 
-}
+}

src/test/java/org/dcache/nearline/cta/TestUtils.java

@@ -1,6 +1,7 @@
 package org.dcache.nearline.cta;
 
 import eu.emi.security.authn.x509.impl.CertificateUtils;
+import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.BasicConstraints;
 import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
@@ -62,16 +63,16 @@ public static void generateSelfSignedCert(File certFile, File keyFile)
                 .addExtension(Extension.subjectAlternativeName, true, new GeneralNames(new GeneralName[] {
                         new GeneralName(GeneralName.dNSName, "localhost"),
                         new GeneralName(GeneralName.dNSName, "localhost4"),
-                        new GeneralName(GeneralName.dNSName, "localhost6")}))
+                        new GeneralName(GeneralName.dNSName, "localhost6"),
+                        new GeneralName(GeneralName.iPAddress, new DEROctetString(new byte[]{127, 0, 0, 1})),
+                        new GeneralName(GeneralName.iPAddress, new DEROctetString(new byte[]{0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1}))}))
                 .addExtension(Extension.basicConstraints, true, new BasicConstraints(true))
                 .addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.digitalSignature | KeyUsage.keyEncipherment))
                 .addExtension(Extension.extendedKeyUsage, true, new ExtendedKeyUsage(
                                 new KeyPurposeId[] {KeyPurposeId.id_kp_clientAuth, KeyPurposeId.id_kp_serverAuth}
                         )
                 );
 
-
-
         String signatureAlgorithm = "SHA256WithRSA";
 
         // sign with own key