From dba91ebed355eef9726b87c8b73795957db0cbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1lm=C3=A1n=20T=C3=B3th?= Date: Sun, 3 May 2020 18:02:08 +0200 Subject: [PATCH 1/2] Fix HostConfig's NanoCpus JsonProperty wrong casing - fixes HostConfig's NanoCpus JsonProperty casing - adds basic tests related to HostConfig NanoCPUs --- .../dockerjava/api/model/HostConfig.java | 2 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 19 +++++++++++++++ .../dockerjava/cmd/InspectContainerCmdIT.java | 15 ++++++++++++ .../dockerjava/cmd/StartContainerCmdIT.java | 23 +++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index afe38d245..0151076fd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -70,7 +70,7 @@ public static HostConfig newHostConfig() { @JsonProperty("MemorySwappiness") private Long memorySwappiness; - @JsonProperty("NanoCPUs") + @JsonProperty("NanoCpus") private Long nanoCPUs; @JsonProperty("CapAdd") diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 227c0acc9..0ae715b5d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -1065,4 +1065,23 @@ public void createContainerWithTmpFs() throws DockerException { InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m")); } + + @Test + public void createContainerWithNanoCPUs() throws DockerException { + Long nanoCPUs = 1000000000L; + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sleep", "9999") + .withHostConfig(newHostConfig() + .withNanoCPUs(nanoCPUs)) + .exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs)); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index 25b9aff18..9e47cfd9f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -138,4 +138,19 @@ public void inspectContainerNetworkSettings() throws DockerException { assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode()); } + + @Test + public void inspectContainerNanoCPUs() throws DockerException { + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("env").exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(0L)); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index 76e4fe329..d4d626939 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -543,6 +543,29 @@ public void startContainerWithRestartPolicy() throws DockerException { assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy))); } + @Test + public void startContainerWithNanoCPUs() throws DockerException { + Long nanoCPUs = 1000000000L; + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("sleep", "9999") + .withHostConfig(newHostConfig() + .withNanoCPUs(nanoCPUs)) + .exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getState().getRunning(), is(true)); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs)); + } + @Test public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerException { From be3444254309c34b8222dc5227113da0f969d5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1lm=C3=A1n=20T=C3=B3th?= Date: Mon, 25 May 2020 14:10:25 +0200 Subject: [PATCH 2/2] Remove unnecessary NanoCPUs test --- .../dockerjava/cmd/StartContainerCmdIT.java | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index d4d626939..76e4fe329 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -543,29 +543,6 @@ public void startContainerWithRestartPolicy() throws DockerException { assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy))); } - @Test - public void startContainerWithNanoCPUs() throws DockerException { - Long nanoCPUs = 1000000000L; - - CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") - .withCmd("sleep", "9999") - .withHostConfig(newHostConfig() - .withNanoCPUs(nanoCPUs)) - .exec(); - - LOG.info("Created container {}", container.toString()); - - assertThat(container.getId(), not(is(emptyString()))); - - dockerRule.getClient().startContainerCmd(container.getId()).exec(); - - InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); - - assertThat(inspectContainerResponse.getState().getRunning(), is(true)); - - assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs)); - } - @Test public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerException {