From b6b77318df262cf8a8b5b51493fde4424e5c246a Mon Sep 17 00:00:00 2001
From: Gurkan Erdogdu <gerdogdu@managecat.com>
Date: Fri, 12 Feb 2016 11:10:28 +0200
Subject: [PATCH 1/2] Docker Swarm Inspect Container Info

---
 .../github/dockerjava/api/model/Labels.java   | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Labels.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Labels.java b/src/main/java/com/github/dockerjava/api/model/Labels.java
new file mode 100644
index 000000000..f88327ba6
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Labels.java
@@ -0,0 +1,67 @@
+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;
+
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Labels {
+
+    @JsonProperty("executiondriver")
+    private String executiondriver;
+
+    @JsonProperty("kernelversion")
+    private String kernelversion;
+
+    @JsonProperty("operatingsystem")
+    private String operatingsystem;
+
+    @JsonProperty("provider")
+    private String provider;
+
+    @JsonProperty("storagedriver")
+    private String storagedriver;
+
+    public String getExecutiondriver() {
+        return executiondriver;
+    }
+
+    public void setExecutiondriver(String executiondriver) {
+        this.executiondriver = executiondriver;
+    }
+
+    public String getKernelversion() {
+        return kernelversion;
+    }
+
+    public void setKernelversion(String kernelversion) {
+        this.kernelversion = kernelversion;
+    }
+
+    public String getOperatingsystem() {
+        return operatingsystem;
+    }
+
+    public void setOperatingsystem(String operatingsystem) {
+        this.operatingsystem = operatingsystem;
+    }
+
+    public String getProvider() {
+        return provider;
+    }
+
+    public void setProvider(String provider) {
+        this.provider = provider;
+    }
+
+    public String getStoragedriver() {
+        return storagedriver;
+    }
+
+    public void setStoragedriver(String storagedriver) {
+        this.storagedriver = storagedriver;
+    }
+
+}

From 940b4a1edcd69c83b87163fc46e611689c95af79 Mon Sep 17 00:00:00 2001
From: Gurkan Erdogdu <gerdogdu@managecat.com>
Date: Fri, 12 Feb 2016 11:12:27 +0200
Subject: [PATCH 2/2] Added swarm node info

Signed-off-by: Gurkan Erdogdu <gerdogdu@managecat.com>
---
 .../api/command/InspectContainerResponse.java |  8 ++++++++
 .../com/github/dockerjava/api/model/Node.java | 20 +++++++++++++++++--
 2 files changed, 26 insertions(+), 2 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 3a49a4dd4..ef9c92652 100644
--- 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;
@@ -98,6 +99,9 @@ public class InspectContainerResponse {
     @JsonProperty("Mounts")
     private List<Mount> mounts;
 
+    @JsonProperty("Node")
+    private Node node;
+
     public String getId() {
         return id;
     }
@@ -202,6 +206,10 @@ public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
 
+    public Node getNode() {
+        return node;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class ContainerState {
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
index 9e8580e0a..530179e48 100644
--- a/src/main/java/com/github/dockerjava/api/model/Node.java
+++ b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -1,5 +1,6 @@
 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;
@@ -8,20 +9,30 @@
  * A node as returned by the /events API, for instance, when Swarm is used.
  */
 @JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Node {
 
     @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 String cpus;
+
+    @JsonProperty("Memory")
+    private String memory;
+
+    @JsonProperty("Labels")
+    private Labels labels;
+
     public String getName() {
         return name;
     }
@@ -37,4 +48,9 @@ public String getAddr() {
     public String getIp() {
         return ip;
     }
+
+    public Labels getLabels() {
+        return labels;
+    }
+
 }