Repository: jclouds-labs Updated Branches: refs/heads/master dc6a14b51 -> a058e9fc9
JCLOUDS-990: fix condition DockerTemplateOptions.copyTo() method Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/a058e9fc Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/a058e9fc Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/a058e9fc Branch: refs/heads/master Commit: a058e9fc9d9a1f496c152fe4b917b2616c3b4e64 Parents: dc6a14b Author: Josef Cacek <[email protected]> Authored: Sun Aug 16 15:13:25 2015 +0200 Committer: Andrea Turli <[email protected]> Committed: Wed Aug 19 14:15:25 2015 +0200 ---------------------------------------------------------------------- .../compute/options/DockerTemplateOptions.java | 2 +- .../options/DockerTemplateOptionsTest.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a058e9fc/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java b/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java index d028ef9..efe0171 100644 --- a/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java +++ b/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java @@ -80,7 +80,7 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable } eTo.memory(memory); eTo.cpuShares(cpuShares); - if (commands.isEmpty()) { + if (!commands.isEmpty()) { eTo.commands(commands); } if (!env.isEmpty()) { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a058e9fc/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java ---------------------------------------------------------------------- diff --git a/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java b/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java index 30a992b..7badb92 100644 --- a/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java +++ b/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java @@ -92,4 +92,22 @@ public class DockerTemplateOptionsTest { assertEquals(options.as(DockerTemplateOptions.class).getCpuShares(), Integer.valueOf(4)); } + @Test + public void testCopyTo() { + DockerTemplateOptions options = DockerTemplateOptions.Builder + .memory(512) + .cpuShares(4) + .commands("test") + .portBindings( + ImmutableMap.<Integer, Integer> builder() + .put(8443, 443).build()).hostname("hostname") + .userMetadata(ImmutableMap.of("key", "value")) + .env(ImmutableList.of("HOST=abc", "PORT=1234")) + .dns("8.8.8.8", "8.8.4.4") + .volumes(ImmutableMap.of("/tmp", "/tmp")); + DockerTemplateOptions optionsCopy = new DockerTemplateOptions(); + options.copyTo(optionsCopy); + assertEquals(optionsCopy, options); + } + }
