You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/08/30 09:35:31 UTC
[07/50] jclouds git commit: JCLOUDS-990: fix condition
DockerTemplateOptions.copyTo() method
JCLOUDS-990: fix condition DockerTemplateOptions.copyTo() method
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/644541a2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/644541a2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/644541a2
Branch: refs/heads/master
Commit: 644541a2f4b9cbdbc68a29108c77f1cf46980657
Parents: 586e318
Author: Josef Cacek <jo...@gmail.com>
Authored: Sun Aug 16 15:13:25 2015 +0200
Committer: Andrea Turli <an...@gmail.com>
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/blob/644541a2/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
----------------------------------------------------------------------
diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java b/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
index d028ef9..efe0171 100644
--- a/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
+++ b/apis/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/blob/644541a2/apis/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java
----------------------------------------------------------------------
diff --git a/apis/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java b/apis/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java
index 30a992b..7badb92 100644
--- a/apis/docker/src/test/java/org/jclouds/docker/compute/options/DockerTemplateOptionsTest.java
+++ b/apis/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);
+ }
+
}