From 2f88b39a4954a2ebc88a4ebdfe74a245c6183685 Mon Sep 17 00:00:00 2001 From: VU Minh Khang Date: Mon, 18 Apr 2016 00:20:48 +0200 Subject: [PATCH 1/6] Add setters in order to be able to construct network creation request --- .../com/github/dockerjava/api/model/Network.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java index 546904254..583441049 100644 --- 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; + } } } } From 14f64794c722522da59ec8b83d6dd17f95f8a54d Mon Sep 17 00:00:00 2001 From: VU Minh Khang Date: Mon, 18 Apr 2016 00:41:55 +0200 Subject: [PATCH 2/6] Fix NPE for withIpamConfig --- .../github/dockerjava/core/command/CreateNetworkCmdImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java index c7d3b0abb..b07076dc5 100644 --- 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; } From 3ed7e7cf32943fbcf604eba3511faeb9c85f17e9 Mon Sep 17 00:00:00 2001 From: VU Minh Khang Date: Mon, 18 Apr 2016 00:54:25 +0200 Subject: [PATCH 3/6] Add test for network creation with ipam config --- .../dockerjava/core/command/CreateNetworkCmdImplTest.java | 5 +++-- .../dockerjava/netty/exec/CreateNetworkCmdExecTest.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java index eefeb535f..25225160b 100644 --- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java @@ -40,8 +40,9 @@ public void afterMethod(ITestResult result) { public void createNetwork() throws DockerException { String networkName = "testNetwork"; - - CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec(); + 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()); diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java index fa9962826..cd5b788ed 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java @@ -40,8 +40,9 @@ public void afterMethod(ITestResult result) { public void createNetwork() throws DockerException { String networkName = "testNetwork"; - - CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec(); + 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()); From 89330387bf90fbe2bde1dcc3bea87b11be47fa06 Mon Sep 17 00:00:00 2001 From: VU Minh Khang Date: Sat, 30 Apr 2016 14:24:44 +0200 Subject: [PATCH 4/6] Separate tests --- .../command/CreateNetworkCmdImplTest.java | 21 ++++++++++++++----- .../netty/exec/CreateNetworkCmdExecTest.java | 21 ++++++++++++++----- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java index 25225160b..c278f191b 100644 --- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java @@ -5,11 +5,7 @@ import com.github.dockerjava.api.model.Network; import com.github.dockerjava.client.AbstractDockerClientTest; import org.testng.ITestResult; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; +import org.testng.annotations.*; import java.lang.reflect.Method; @@ -39,6 +35,20 @@ public void afterMethod(ITestResult result) { @Test public void createNetwork() throws DockerException { + String networkName = "testNetwork"; + + CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec(); + + assertNotNull(createNetworkResponse.getId()); + + Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); + assertEquals(network.getName(), networkName); + assertEquals(network.getDriver(), "bridge"); + } + + @Test + public void createNetworkWithCustomConfig() throws DockerException { + String networkName = "testNetwork"; Network.Ipam.Config config = new Network.Ipam.Config(); config.setSubnet("10.67.79.0/24"); @@ -49,5 +59,6 @@ public void createNetwork() throws DockerException { 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 index cd5b788ed..974d684b8 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java @@ -5,11 +5,7 @@ import com.github.dockerjava.api.model.Network; import com.github.dockerjava.netty.AbstractNettyDockerClientTest; import org.testng.ITestResult; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; +import org.testng.annotations.*; import java.lang.reflect.Method; @@ -39,6 +35,20 @@ public void afterMethod(ITestResult result) { @Test public void createNetwork() throws DockerException { + String networkName = "testNetwork"; + + CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec(); + + assertNotNull(createNetworkResponse.getId()); + + Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); + assertEquals(network.getName(), networkName); + assertEquals(network.getDriver(), "bridge"); + } + + @Test + public void createNetworkWithCustomConfig() throws DockerException { + String networkName = "testNetwork"; Network.Ipam.Config config = new Network.Ipam.Config(); config.setSubnet("10.67.79.0/24"); @@ -49,5 +59,6 @@ public void createNetwork() throws DockerException { 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()); } } From 90ff0bd99b490a3eb4553f36c222a7c5d3881af6 Mon Sep 17 00:00:00 2001 From: VU Minh Khang Date: Thu, 5 May 2016 20:43:46 +0200 Subject: [PATCH 5/6] Fix imports --- .../dockerjava/core/command/CreateNetworkCmdImplTest.java | 6 +++++- .../dockerjava/netty/exec/CreateNetworkCmdExecTest.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java index c278f191b..f56a89f64 100644 --- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java @@ -5,7 +5,11 @@ import com.github.dockerjava.api.model.Network; import com.github.dockerjava.client.AbstractDockerClientTest; import org.testng.ITestResult; -import org.testng.annotations.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; import java.lang.reflect.Method; diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java index 974d684b8..35602ddd9 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java @@ -5,7 +5,11 @@ import com.github.dockerjava.api.model.Network; import com.github.dockerjava.netty.AbstractNettyDockerClientTest; import org.testng.ITestResult; -import org.testng.annotations.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; import java.lang.reflect.Method; From 4431df9c0dee7d6d75554c27a59c5157caf6b395 Mon Sep 17 00:00:00 2001 From: VU Minh Khang Date: Fri, 6 May 2016 10:20:46 +0200 Subject: [PATCH 6/6] Fix test names --- .../dockerjava/core/command/CreateNetworkCmdImplTest.java | 2 +- .../github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java index f56a89f64..4875ba7c5 100644 --- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java @@ -51,7 +51,7 @@ public void createNetwork() throws DockerException { } @Test - public void createNetworkWithCustomConfig() throws DockerException { + public void createNetworkWithIpamConfig() throws DockerException { String networkName = "testNetwork"; Network.Ipam.Config config = new Network.Ipam.Config(); diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java index 35602ddd9..63f2eb620 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java @@ -51,7 +51,7 @@ public void createNetwork() throws DockerException { } @Test - public void createNetworkWithCustomConfig() throws DockerException { + public void createNetworkWithIpamConfig() throws DockerException { String networkName = "testNetwork"; Network.Ipam.Config config = new Network.Ipam.Config();