Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docker live test fix - SshToCustomPortLiveTest didn't work for remote docker endpoints due to wrong port number used

This commit is contained in:
Josef Cacek 2016-08-22 13:44:19 +02:00 committed by Ignasi Barrera
parent c4605a32d4
commit 71dd766227
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apis/docker/src/test/java/org/jclouds/docker/compute/SshToCustomPortLiveTest.java
View File

@ -121,7 +121,7 @@ public class SshToCustomPortLiveTest extends BaseComputeServiceContextLiveTest {
String nodeId = null;
try {
NodeMetadata node = Iterables
.getOnlyElement(view.getComputeService().createNodesInGroup("ssh-test", 1, template));
.getOnlyElement(view.getComputeService().createNodesInGroup("ssh-net-host", 1, template));
nodeId = node.getId();
ExecResponse response = view.getComputeService().runScriptOnNode(nodeId, "sh -c 'echo hello && sleep 0.2'", wrapInInitScript(false));
@ -152,7 +152,7 @@ public class SshToCustomPortLiveTest extends BaseComputeServiceContextLiveTest {
String nodeId = null;
try {
NodeMetadata node = Iterables
.getOnlyElement(view.getComputeService().createNodesInGroup("ssh-test-advanced", 1, template));
.getOnlyElement(view.getComputeService().createNodesInGroup("ssh-net-bridge", 1, template));
nodeId = node.getId();
ExecResponse response = view.getComputeService().runScriptOnNode(nodeId, "sh -c 'true'",
@ -214,8 +214,8 @@ public class SshToCustomPortLiveTest extends BaseComputeServiceContextLiveTest {
protected void configure() {
bind(LoginPortForContainer.class).toInstance(new LoginPortForContainer() {
@Override
public Optional<Integer> apply(Container input) {
return Optional.of(SSH_PORT);
public Optional<Integer> apply(Container container) {
return Optional.of(container.name().contains("ssh-net-bridge") ? SSH_PORT_BRIDGE : SSH_PORT);
}
});
}