From 86b80d2820b819f2ac77586d9e36ae0a0f1bd783 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Fri, 6 May 2016 10:19:00 +0200
Subject: [PATCH 1/2] Add node information in inspec container response

---
 .../api/command/InspectContainerResponse.java |  8 +++
 .../dockerjava/api/model/SwarmNode.java       | 54 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNode.java

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 d19bc0329..0f8a928a7 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -19,6 +19,7 @@
 import com.github.dockerjava.api.model.VolumeBinds;
 import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesRW;
+import com.github.dockerjava.api.model.SwarmNode;
 import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
@@ -65,6 +66,9 @@ public class InspectContainerResponse {
     @JsonProperty("Name")
     private String name;
 
+    @JsonProperty("Node")
+    private SwarmNode node;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_17}
      */
@@ -138,6 +142,10 @@ public String getResolvConfPath() {
         return resolvConfPath;
     }
 
+    public SwarmNode getNode() {
+        return node;
+    }
+
     @JsonIgnore
     public VolumeBind[] getVolumes() {
         return volumes == null ? null : volumes.getBinds();
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
new file mode 100644
index 000000000..ed1ed765a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
@@ -0,0 +1,54 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Map;
+
+/**
+ * A node as returned by swarm api
+ */
+@JsonInclude(Include.NON_NULL)
+public class SwarmNode {
+
+    @JsonProperty("ID")
+    private String id;
+
+    @JsonProperty("IP")
+    private String ip;
+
+    @JsonProperty("Addr")
+    private String addr;
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Cpus")
+    private Integer cpus;
+
+    @JsonProperty("Memory")
+    private long memory;
+
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
+    @JsonProperty("Version")
+    private String version;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getAddr() {
+        return addr;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+}

From ed2b6bca75c8962614c21da08d5d01d764b970b3 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Wed, 1 Jun 2016 02:30:03 +0200
Subject: [PATCH 2/2] Remove temporarily unused property which break
 compatibility with API version 1.22

---
 .../java/com/github/dockerjava/api/model/NetworkSettings.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
index 680048c18..7ed267367 100644
--- a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -209,10 +209,6 @@ public String toString() {
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Network {
-
-        @JsonProperty("IPAMConfig")
-        private String ipamConfig;
-
         /**
          * @since {@link RemoteApiVersion#VERSION_1_22}
          */