Merge branch 'vuminhkh-master't push origin master

Marcus Linke · Marcus Linke · commit e753fae97e08 · 2016-05-12T21:03:41.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -149,6 +149,18 @@ public String getIpRange() {
             public String getGateway() {
                 return gateway;
             }
+
+            public void setSubnet(String subnet) {
+                this.subnet = subnet;
+            }
+
+            public void setIpRange(String ipRange) {
+                this.ipRange = ipRange;
+            }
+
+            public void setGateway(String gateway) {
+                this.gateway = gateway;
+            }
         }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
@@ -58,6 +58,9 @@ public CreateNetworkCmd withDriver(String driver) {
 
     @Override
     public CreateNetworkCmd withIpamConfig(Ipam.Config config) {
+        if (this.ipam == null) {
+            this.ipam = new Ipam();
+        }
         this.ipam.getConfig().add(config);
         return this;
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -49,4 +49,20 @@ public void createNetwork() throws DockerException {
         assertEquals(network.getName(), networkName);
         assertEquals(network.getDriver(), "bridge");
     }
+
+    @Test
+    public void createNetworkWithIpamConfig() throws DockerException {
+
+        String networkName = "testNetwork";
+        Network.Ipam.Config config = new Network.Ipam.Config();
+        config.setSubnet("10.67.79.0/24");
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withIpamConfig(config).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals(network.getDriver(), "bridge");
+        assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
@@ -49,4 +49,20 @@ public void createNetwork() throws DockerException {
         assertEquals(network.getName(), networkName);
         assertEquals(network.getDriver(), "bridge");
     }
+
+    @Test
+    public void createNetworkWithIpamConfig() throws DockerException {
+
+        String networkName = "testNetwork";
+        Network.Ipam.Config config = new Network.Ipam.Config();
+        config.setSubnet("10.67.79.0/24");
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withIpamConfig(config).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals(network.getDriver(), "bridge");
+        assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,18 @@ public String getIpRange() {`
`149`	`149`	`public String getGateway() {`
`150`	`150`	`return gateway;`
`151`	`151`	`}`
	`152`	`+`
	`153`	`+ public void setSubnet(String subnet) {`
	`154`	`+ this.subnet = subnet;`
	`155`	`+ }`
	`156`	`+`
	`157`	`+ public void setIpRange(String ipRange) {`
	`158`	`+ this.ipRange = ipRange;`
	`159`	`+ }`
	`160`	`+`
	`161`	`+ public void setGateway(String gateway) {`
	`162`	`+ this.gateway = gateway;`
	`163`	`+ }`
`152`	`164`	`}`
`153`	`165`	`}`
`154`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ public CreateNetworkCmd withDriver(String driver) {`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`public CreateNetworkCmd withIpamConfig(Ipam.Config config) {`
	`61`	`+ if (this.ipam == null) {`
	`62`	`+ this.ipam = new Ipam();`
	`63`	`+ }`
`61`	`64`	`this.ipam.getConfig().add(config);`
`62`	`65`	`return this;`
`63`	`66`	`}`