Skip to content

Add missing Info fields #159

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
marcuslinke merged 2 commits into from
Feb 24, 2015
Merged

Add missing Info fields #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
553b394
Fix issue #158
Feb 24, 2015
5bed982
Fix race condition
Feb 24, 2015
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
57 changes: 53 additions & 4 deletions src/main/java/com/github/dockerjava/api/model/Info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public class Info {

@JsonProperty("Debug")
private boolean debug;

@JsonProperty("DockerRootDir")
private String DockerRootDir;

@JsonProperty("Driver")
private String driver;
Expand All @@ -34,9 +37,12 @@ public class Info {

@JsonProperty("ExecutionDriver")
private String executionDriver;

@JsonProperty("ID")
private String ID;

@JsonProperty("IPv4Forwarding")
private String IPv4Forwarding;
private boolean IPv4Forwarding;

@JsonProperty("Images")
private int images;
Expand All @@ -52,9 +58,21 @@ public class Info {

@JsonProperty("KernelVersion")
private String kernelVersion;

@JsonProperty("Labels")
private String Labels;

@JsonProperty("MemoryLimit")
private boolean memoryLimit;

@JsonProperty("MemTotal")
private long memTotal;

@JsonProperty("Name")
private String name;

@JsonProperty("NCPU")
private int NCPU;

@JsonProperty("NEventsListener")
private long nEventListener;
Expand All @@ -64,12 +82,15 @@ public class Info {

@JsonProperty("NGoroutines")
private int NGoroutines;

@JsonProperty("OperatingSystem")
private String OperatingSystem;

@JsonProperty("Sockets")
private String[] sockets;

@JsonProperty("SwapLimit")
private int swapLimit;
private boolean swapLimit;

public boolean isDebug() {
return debug;
Expand All @@ -78,6 +99,10 @@ public boolean isDebug() {
public int getContainers() {
return containers;
}

public String getDockerRootDir() {
return DockerRootDir;
}

public String getDriver() {
return driver;
Expand All @@ -90,8 +115,12 @@ public List<Object> getDriverStatuses() {
public int getImages() {
return images;
}

public String getID() {
return ID;
}

public String getIPv4Forwarding() {
public boolean getIPv4Forwarding() {
return IPv4Forwarding;
}

Expand All @@ -110,6 +139,10 @@ public String getInitSha1() {
public String getKernelVersion() {
return kernelVersion;
}

public String getLabels() {
return Labels;
}

public String[] getSockets() {
return sockets;
Expand All @@ -122,6 +155,18 @@ public boolean isMemoryLimit() {
public long getnEventListener() {
return nEventListener;
}

public long getMemTotal() {
return memTotal;
}

public String getName() {
return name;
}

public int getNCPU() {
return NCPU;
}

public int getNFd() {
return NFd;
Expand All @@ -130,8 +175,12 @@ public int getNFd() {
public int getNGoroutines() {
return NGoroutines;
}

public String getOperatingSystem() {
return OperatingSystem;
}

public int getSwapLimit() {
public boolean getSwapLimit() {
return swapLimit;
}

Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,6 @@ public void info() throws DockerException {
assertTrue(dockerInfo.getImages() > 0);
assertTrue(dockerInfo.getNFd() > 0);
assertTrue(dockerInfo.getNGoroutines() > 0);
assertTrue(dockerInfo.getNCPU() > 0);
}
}
2 changes: 1 addition & 1 deletion src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public void startContainerWithLinking() throws DockerException {
}

CreateContainerResponse container2 = dockerClient
.createContainerCmd("busybox").withCmd("true")
.createContainerCmd("busybox").withCmd("sleep", "9999")
.withName("container2").exec();

LOG.info("Created container2 {}", container2.toString());
Expand Down