Skip to content

Fix HostConfig's NanoCpus JsonProperty wrong casing #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bsideup merged 4 commits into from
May 29, 2020
Merged

Fix HostConfig's NanoCpus JsonProperty wrong casing #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dba91eb
Fix HostConfig's NanoCpus JsonProperty wrong casing
klmntoth May 3, 2020
e08616b
Merge branch 'master' into fix-hostconfig-nanocpus
bsideup May 23, 2020
81fdedb
Merge branch 'master' into fix-hostconfig-nanocpus
bsideup May 24, 2020
be34442
Remove unnecessary NanoCPUs test
klmntoth May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static HostConfig newHostConfig() {
@JsonProperty("MemorySwappiness")
private Long memorySwappiness;

@JsonProperty("NanoCPUs")
@JsonProperty("NanoCpus")
private Long nanoCPUs;

@JsonProperty("CapAdd")
Expand Down
19 changes: 19 additions & 0 deletions docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
15 changes: 15 additions & 0 deletions docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}