Minor cleanup and enabled simple server image to listen to ipv4

3 files changed, 15 insertions, 15 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
index 883c94cc5b7..609896a01bb 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
@@ -130,7 +130,7 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand {
         List<String> labelList = labels.entrySet().stream()
                 .map(entry -> entry.getKey() + "=" + entry.getValue()).collect(Collectors.toList());
 
-        return "--name " + containerName + " "
+        return "--name " + containerName.asString() + " "
                 + "--hostname " + hostName + " "
                 + toRepeatedOption("--label", labelList)
                 + toRepeatedOption("--env", environmentAssignments)
@@ -139,7 +139,7 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand {
                 + toOptionalOption("--net", networkMode)
                 + toOptionalOption("--ip", ipv4Address)
                 + toOptionalOption("--ip6", ipv6Address)
-                + dockerImage;
+                + dockerImage.asString();
     }
 
     private String generateRandomMACAddress() {
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index 9142009a48f..5e5185bc6be 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -79,9 +79,6 @@ public class DockerImpl implements Docker {
     private CounterWrapper numberOfDockerDaemonFails;
     private final boolean hackAroundPullImageDueToJerseyConflicts;
 
-    private JerseyDockerCmdExecFactory dockerFactory;
-    private RemoteApiVersion remoteApiVersion;
-
     // For testing
     DockerImpl(final DockerClient dockerClient) {
         hackAroundPullImageDueToJerseyConflicts = false;
@@ -89,7 +86,7 @@ public class DockerImpl implements Docker {
     }
 
     // For testing
-    public DockerImpl(final DockerConfig config) {
+    DockerImpl(final DockerConfig config) {
         hackAroundPullImageDueToJerseyConflicts = false;
         // Fail fast
         initDockerConnection(config, 100 /* connect timeout millis */, false /* fallback to 1.23 on errors */);
@@ -532,12 +529,13 @@ public class DockerImpl implements Docker {
         }
     }
 
-    private void initDockerConnection(final DockerConfig config, int connectTimeousMs, boolean fallbackTo123orErrors) {
-        dockerFactory = new JerseyDockerCmdExecFactory()
+    private void initDockerConnection(final DockerConfig config, int connectTimeoutMs, boolean fallbackTo123orErrors) {
+        JerseyDockerCmdExecFactory dockerFactory = new JerseyDockerCmdExecFactory()
                 .withMaxPerRouteConnections(DOCKER_MAX_PER_ROUTE_CONNECTIONS)
                 .withMaxTotalConnections(DOCKER_MAX_TOTAL_CONNECTIONS)
-                .withConnectTimeout(connectTimeousMs)
+                .withConnectTimeout(connectTimeoutMs)
                 .withReadTimeout(DOCKER_READ_TIMEOUT_MILLIS);
+        RemoteApiVersion remoteApiVersion;
         try {
             remoteApiVersion = RemoteApiVersion.parseConfig(DockerClientImpl.getInstance(
                     buildDockerClientConfig(config).build())
@@ -571,7 +569,7 @@ public class DockerImpl implements Docker {
         numberOfRunningContainersGauge = metricReceiver.declareGauge(dimensions, "containers.running");
         numberOfDockerDaemonFails = metricReceiver.declareCounter(dimensions, "daemon.api_fails");
 
-        // Some containers could already be running, count them and intialize to that value
+        // Some containers could already be running, count them and initialize to that value
         numberOfRunningContainersGauge.sample(getAllManagedContainers().size());
     }
 }
diff --git a/docker-api/src/test/resources/simple-ipv6-server/src/server.py b/docker-api/src/test/resources/simple-ipv6-server/src/server.py
index 320f311e0fc..c28c288bbca 100644
--- a/docker-api/src/test/resources/simple-ipv6-server/src/server.py
+++ b/docker-api/src/test/resources/simple-ipv6-server/src/server.py
@@ -28,14 +28,16 @@ class MyHandler(SimpleHTTPRequestHandler):
             return
 
 
-class HTTPServerV6(HTTPServer):
-    address_family = socket.AF_INET6
+class DualHTTPServer(HTTPServer):
+    def __init__(self, address, handler):
+        self.address_family = socket.AF_INET6 if (':' in address[0]) else socket.AF_INET
+        HTTPServer.__init__(self, address, handler)
 
 
-def main():
-    server = HTTPServerV6(('::', 80), MyHandler)
+def main(ipv6):
+    server = DualHTTPServer(('::' if ipv6 else '', 80), MyHandler)
     server.serve_forever()
 
 
 if __name__ == '__main__':
-    main()
+    main(False)