From 452b108ad74b6cb2fc98d20e1fc1d1ee6b26ec7d Mon Sep 17 00:00:00 2001 From: martonsereg Date: Mon, 16 Mar 2015 15:56:36 +0100 Subject: [PATCH] added node field to docker inspect --- .../api/command/InspectContainerResponse.java | 199 +++++++++++------- 1 file changed, 125 insertions(+), 74 deletions(-) diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index c86e13c54..4c6c93857 100644 --- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -5,6 +5,7 @@ import java.util.Map; import com.github.dockerjava.api.model.*; + import org.apache.commons.lang.builder.ToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,65 +13,66 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** - * * @author Konstantin Pelykh (kpelykh@gmail.com) - * */ @JsonIgnoreProperties(ignoreUnknown = true) public class InspectContainerResponse { - @JsonProperty("Args") - private String[] args; + @JsonProperty("Args") + private String[] args; - @JsonProperty("Config") - private ContainerConfig config; + @JsonProperty("Config") + private ContainerConfig config; - @JsonProperty("Created") - private String created; + @JsonProperty("Created") + private String created; - @JsonProperty("Driver") - private String driver; + @JsonProperty("Driver") + private String driver; - @JsonProperty("ExecDriver") - private String execDriver; + @JsonProperty("ExecDriver") + private String execDriver; - @JsonProperty("HostConfig") - private HostConfig hostConfig; + @JsonProperty("HostConfig") + private HostConfig hostConfig; - @JsonProperty("HostnamePath") - private String hostnamePath; + @JsonProperty("HostnamePath") + private String hostnamePath; - @JsonProperty("HostsPath") - private String hostsPath; + @JsonProperty("HostsPath") + private String hostsPath; - @JsonProperty("Id") + @JsonProperty("Id") private String id; - @JsonProperty("Image") - private String imageId; + @JsonProperty("Image") + private String imageId; + + @JsonProperty("MountLabel") + private String mountLabel; - @JsonProperty("MountLabel") - private String mountLabel; + @JsonProperty("Name") + private String name; - @JsonProperty("Name") - private String name; + @JsonProperty("NetworkSettings") + private NetworkSettings networkSettings; - @JsonProperty("NetworkSettings") - private NetworkSettings networkSettings; + @JsonProperty("Node") + private Node node; - @JsonProperty("Path") + @JsonProperty("Path") private String path; - @JsonProperty("ProcessLabel") + @JsonProperty("ProcessLabel") private String processLabel; - @JsonProperty("ResolvConfPath") - private String resolvConfPath; + @JsonProperty("ResolvConfPath") + private String resolvConfPath; @JsonProperty("ExecIDs") private List execIds; - @JsonProperty("State") + @JsonProperty("State") private ContainerState state; @JsonProperty("Volumes") @@ -92,8 +94,8 @@ public String getPath() { } public String getProcessLabel() { - return processLabel; - } + return processLabel; + } public String[] getArgs() { return args; @@ -115,6 +117,10 @@ public NetworkSettings getNetworkSettings() { return networkSettings; } + public Node getNode() { + return node; + } + public String getResolvConfPath() { return resolvConfPath; } @@ -150,12 +156,12 @@ public HostConfig getHostConfig() { } public String getExecDriver() { - return execDriver; - } + return execDriver; + } public String getMountLabel() { - return mountLabel; - } + return mountLabel; + } public List getExecIds() { return execIds; @@ -173,33 +179,78 @@ public class NetworkSettings { @JsonProperty("IPPrefixLen") private int ipPrefixLen; @JsonProperty("Gateway") private String gateway; @JsonProperty("Bridge") private String bridge; - @JsonProperty("PortMapping") private Map> portMapping; + @JsonProperty("PortMapping") private Map> portMapping; @JsonProperty("Ports") private Ports ports; public String getIpAddress() { - return ipAddress; - } + return ipAddress; + } + + public int getIpPrefixLen() { + return ipPrefixLen; + } + + public String getGateway() { + return gateway; + } + + public String getBridge() { + return bridge; + } + + public Map> getPortMapping() { + return portMapping; + } + + public Ports getPorts() { + return ports; + } + + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this); + } + } - public int getIpPrefixLen() { - return ipPrefixLen; - } + @JsonIgnoreProperties(ignoreUnknown = true) + public class Node { + + @JsonProperty("ID") private String id; + @JsonProperty("IP") private String ip; + @JsonProperty("Addr") private String addr; + @JsonProperty("Name") private String name; + @JsonProperty("Cpus") private int cpus; + @JsonProperty("Memory") private Long memory; + @JsonProperty("Labels") private Map labels; + + public String getId() { + return id; + } - public String getGateway() { - return gateway; - } + public String getIp() { + return ip; + } - public String getBridge() { - return bridge; - } + public String getAddr() { + return addr; + } - public Map> getPortMapping() { - return portMapping; - } + public String getName() { + return name; + } - public Ports getPorts() { - return ports; - } + public int getCpus() { + return cpus; + } + public Long getMemory() { + return memory; + } + + public Map getLabels() { + return labels; + } @Override public String toString() { @@ -207,6 +258,7 @@ public String toString() { } } + @JsonIgnoreProperties(ignoreUnknown = true) public class ContainerState { @@ -218,28 +270,28 @@ public class ContainerState { @JsonProperty("FinishedAt") private String finishedAt; public boolean isRunning() { - return running; - } + return running; + } - public boolean isPaused() { - return paused; - } + public boolean isPaused() { + return paused; + } - public int getPid() { - return pid; - } + public int getPid() { + return pid; + } - public int getExitCode() { - return exitCode; - } + public int getExitCode() { + return exitCode; + } - public String getStartedAt() { - return startedAt; - } + public String getStartedAt() { + return startedAt; + } - public String getFinishedAt() { - return finishedAt; - } + public String getFinishedAt() { + return finishedAt; + } @Override public String toString() { @@ -248,4 +300,3 @@ public String toString() { } } -