Docker live test fix - SshToCustomPortLiveTest didn't work for remote docker endpoints due to wrong port number used
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/71dd7662 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/71dd7662 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/71dd7662 Branch: refs/heads/master Commit: 71dd766227332c5f191788ee8d5d6dedd3771c19 Parents: c4605a3 Author: Josef Cacek <[email protected]> Authored: Mon Aug 22 13:44:19 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Mon Aug 29 22:27:32 2016 +0200 ---------------------------------------------------------------------- .../org/jclouds/docker/compute/SshToCustomPortLiveTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/71dd7662/apis/docker/src/test/java/org/jclouds/docker/compute/SshToCustomPortLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/docker/src/test/java/org/jclouds/docker/compute/SshToCustomPortLiveTest.java b/apis/docker/src/test/java/org/jclouds/docker/compute/SshToCustomPortLiveTest.java index 23f3838..2e815a4 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/compute/SshToCustomPortLiveTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/compute/SshToCustomPortLiveTest.java @@ -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); } }); }
