Merge pull request #396 from mesos/bug/392-NetworkingHostname

Bug: Added hosts to TimeoutSchedulerContainer.
mesos · Nov 3, 2015 · d79e036 · d79e036
2 parents 42afe78 + 1fc0fe8
commit d79e036
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...c/systemTest/java/org/apache/mesos/elasticsearch/systemtest/ReconciliationSystemTest.java b/...c/systemTest/java/org/apache/mesos/elasticsearch/systemtest/ReconciliationSystemTest.java
@@ -1,5 +1,6 @@
 package org.apache.mesos.elasticsearch.systemtest;
 
+import com.containersol.minimesos.mesos.MesosSlave;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import org.apache.mesos.elasticsearch.common.cli.ElasticsearchCLIParameter;
@@ -16,6 +17,8 @@
 
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static com.jayway.awaitility.Awaitility.await;
@@ -119,10 +122,13 @@ protected TimeoutSchedulerContainer(DockerClient dockerClient, String zkIp) {
 
         @Override
         protected CreateContainerCmd dockerCommand() {
+            List<MesosSlave> slaves = Arrays.asList(CLUSTER.getSlaves());
+
             return dockerClient
                     .createContainerCmd(getTestConfig().getSchedulerImageName())
                     .withName(getTestConfig().getSchedulerName() + "_" + new SecureRandom().nextInt())
                     .withEnv("JAVA_OPTS=-Xms128m -Xmx256m")
+                    .withExtraHosts(slaves.stream().map(mesosSlave -> mesosSlave.getHostname() + ":" + DOCKER0_ADAPTOR_IP_ADDRESS).toArray(String[]::new))
                     .withCmd(
                             ZookeeperCLIParameter.ZOOKEEPER_MESOS_URL, getZookeeperMesosUrl(),
                             Configuration.EXECUTOR_HEALTH_DELAY, "99",