Issue 761: Inspect command response should include docker swarm node info

loganbruns · vuminhkh · commit f4bf1f0d79c6 · 2017-02-03T14:27:18.000+01:00
#761 It is useful to be able to tell which node a container is running on for various scenarios such as routing traffic dynamically to it. I've tested a change to add this information and will create a PR shortly.
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -14,6 +14,7 @@
 import com.github.dockerjava.api.model.ContainerConfig;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.NetworkSettings;
+import com.github.dockerjava.api.model.Node;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
 import com.github.dockerjava.api.model.VolumeBinds;
@@ -83,6 +84,9 @@ public class InspectContainerResponse {
     @JsonProperty("NetworkSettings")
     private NetworkSettings networkSettings;
 
+    @JsonProperty("Node")
+    private Node node;
+
     @JsonProperty("Path")
     private String path;
 
@@ -147,6 +151,10 @@ public NetworkSettings getNetworkSettings() {
         return networkSettings;
     }
 
+    public Node getNode() {
+        return node;
+    }
+
     public String getResolvConfPath() {
         return resolvConfPath;
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -1,30 +1,50 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.Map;
 
 import java.io.Serializable;
 
 /**
  * A node as returned by the /events API, for instance, when Swarm is used.
  */
 @JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Node implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
     private String name;
 
-    @JsonProperty("Id")
+    @JsonProperty("ID")
     private String id;
 
     @JsonProperty("Addr")
     private String addr;
 
-    @JsonProperty("Ip")
+    @JsonProperty("IP")
     private String ip;
 
+    @JsonProperty("Cpus")
+    private Integer cpus;
+
+    @JsonProperty("Memory")
+    private Long memory;
+
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
+    @JsonProperty("Version")
+    private String version;
+
+    @JsonProperty("DeltaDuration")
+    private Long deltaDuration;
+
     public String getName() {
         return name;
     }
@@ -40,4 +60,29 @@ public String getAddr() {
     public String getIp() {
         return ip;
     }
+
+    public Integer getCpus() {
+        return cpus;
+    }
+
+    public Long getMemory() {
+        return memory;
+    }
+
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public Long getDeltaDuration() {
+        return deltaDuration;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }
