Merge pull request #291 from Khva0/master

marcuslinke · marcuslinke · commit 140e8db0bde3 · 2015-08-26T23:49:15.000+02:00
Moved "Memory", "MemorySwap" and "CpuShares" mappings from ContainerConfig to HostConfig
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -28,12 +28,6 @@ public class ContainerConfig {
     @JsonProperty("Cmd")
     private String[] cmd;
 
-    @JsonProperty("CpuShares")
-    private int cpuShares = 0;
-
-    @JsonProperty("Cpuset")
-    private String cpuset = "";
-
     @JsonProperty("Domainname")
     private String domainName = "";
 
@@ -58,12 +52,6 @@ public class ContainerConfig {
     @JsonProperty("MacAddress")
     private String macAddress;
 
-    @JsonProperty("Memory")
-    private long memoryLimit = 0;
-
-    @JsonProperty("MemorySwap")
-    private long memorySwap = 0;
-
     @JsonProperty("NetworkDisabled")
     private boolean networkDisabled = false;
 
@@ -136,22 +124,6 @@ public String getMacAddress() {
         return macAddress;
     }
 
-    public long getMemoryLimit() {
-        return memoryLimit;
-    }
-
-    public long getMemorySwap() {
-        return memorySwap;
-    }
-
-    public int getCpuShares() {
-        return cpuShares;
-    }
-
-    public String getCpuset() {
-        return cpuset;
-    }
-
     public boolean isAttachStdin() {
         return attachStdin;
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -66,6 +66,15 @@ public class HostConfig {
     @JsonProperty("Ulimits")
     private Ulimit[] ulimits;
 
+    @JsonProperty("Memory")
+    private long memoryLimit = 0;
+
+    @JsonProperty("MemorySwap")
+    private long memorySwap = 0;
+
+    @JsonProperty("CpuShares")
+    private int cpuShares = 0;
+
     public HostConfig() {
     }
 
@@ -173,6 +182,18 @@ public Ulimit[] getUlimits() {
         return ulimits;
     }
 
+    public long getMemoryLimit() {
+        return memoryLimit;
+    }
+
+    public long getMemorySwap() {
+        return memorySwap;
+    }
+
+    public int getCpuShares() {
+        return cpuShares;
+    }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);
