Skip to content

Commit 6990804

Browse files
KostyaShaKostyaSha
committed
Fix network test.
1 parent 8a3108f commit 6990804

File tree

2 files changed

+57
-24
lines changed

2 files changed

+57
-24
lines changed

‎src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.github.dockerjava.api.command.CreateContainerResponse;
44
import com.github.dockerjava.api.command.CreateNetworkResponse;
55
import com.github.dockerjava.api.command.InspectContainerResponse;
6+
import com.github.dockerjava.api.exception.DockerException;
67
import com.github.dockerjava.api.model.ContainerNetwork;
78
import com.github.dockerjava.api.model.Network;
89
import com.github.dockerjava.client.AbstractDockerClientTest;
@@ -16,6 +17,10 @@
1617
import java.lang.reflect.Method;
1718
import java.util.Collections;
1819

20+
import static org.hamcrest.Matchers.hasItem;
21+
import static org.hamcrest.core.Is.is;
22+
import static org.junit.Assert.assertThat;
23+
1924
@Test(groups = "integration")
2025
public class ConnectToNetworkCmdImplTest extends AbstractDockerClientTest {
2126

@@ -60,38 +65,49 @@ public void connectToNetwork() throws InterruptedException {
6065

6166
@Test
6267
public void connectToNetworkWithContainerNetwork() throws InterruptedException {
68+
final String NETWORK_SUBNET = "10.100.102.0/24";
69+
final String NETWORK_NAME = "jerseyTestNetwork";
70+
final String CONTAINER_IP = "10.100.102.100";
71+
72+
CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
73+
.withCmd("sleep", "9999")
74+
.exec();
6375

64-
CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
6576
dockerClient.startContainerCmd(container.getId()).exec();
6677

78+
try {
79+
dockerClient.removeNetworkCmd(NETWORK_NAME).exec();
80+
} catch (DockerException ignore) {
81+
}
82+
6783
CreateNetworkResponse network = dockerClient.createNetworkCmd()
68-
.withName("testNetwork")
84+
.withName(NETWORK_NAME)
6985
.withIpam(new Network.Ipam()
70-
.withConfig(new Network.Ipam.Config()
71-
.withSubnet("10.100.100.0/24")))
86+
.withConfig(new Network.Ipam.Config()
87+
.withSubnet(NETWORK_SUBNET)))
7288
.exec();
7389

7490
dockerClient.connectToNetworkCmd()
7591
.withNetworkId(network.getId())
7692
.withContainerId(container.getId())
7793
.withContainerNetwork(new ContainerNetwork()
78-
.withAliases("testing")
79-
.withIpamConfig(new ContainerNetwork.Ipam()
80-
.withIpv4Address("10.100.100.100")))
94+
.withAliases("aliasName")
95+
.withIpamConfig(new ContainerNetwork.Ipam()
96+
.withIpv4Address(CONTAINER_IP)))
8197
.exec();
8298

8399
Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
84100

85101
Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
86102
assertNotNull(containerNetworkConfig);
87-
assertEquals(containerNetworkConfig.getIpv4Address(), "10.100.100.100/24");
103+
assertThat(containerNetworkConfig.getIpv4Address(), is(CONTAINER_IP + "/24"));
88104

89105
InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
90106

91-
ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork");
107+
ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(NETWORK_NAME);
92108
assertNotNull(testNetwork);
93-
assertEquals(testNetwork.getAliases(), Collections.singletonList("testing"));
94-
assertEquals(testNetwork.getGateway(), "10.100.100.1");
95-
assertEquals(testNetwork.getIpAddress(), "10.100.100.100");
109+
assertThat(testNetwork.getAliases(), hasItem("aliasName"));
110+
assertEquals(testNetwork.getGateway(), "10.100.102.1");
111+
assertEquals(testNetwork.getIpAddress(), CONTAINER_IP);
96112
}
97113
}

‎src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.github.dockerjava.api.command.CreateContainerResponse;
44
import com.github.dockerjava.api.command.CreateNetworkResponse;
55
import com.github.dockerjava.api.command.InspectContainerResponse;
6+
import com.github.dockerjava.api.exception.DockerException;
7+
import com.github.dockerjava.api.exception.NotFoundException;
68
import com.github.dockerjava.api.model.ContainerNetwork;
79
import com.github.dockerjava.api.model.Network;
810
import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
@@ -17,6 +19,10 @@
1719
import java.lang.reflect.Method;
1820
import java.util.Collections;
1921

22+
import static org.hamcrest.Matchers.hasItem;
23+
import static org.hamcrest.core.Is.is;
24+
import static org.junit.Assert.assertThat;
25+
2026
@Test(groups = "integration")
2127
public class ConnectToNetworkCmdExecTest extends AbstractNettyDockerClientTest {
2228

@@ -61,38 +67,49 @@ public void connectToNetwork() throws InterruptedException {
6167

6268
@Test
6369
public void connectToNetworkWithContainerNetwork() throws InterruptedException {
70+
final String NETWORK_SUBNET = "10.100.101.0/24";
71+
final String NETWORK_NAME = "nettyTestNetwork";
72+
final String CONTAINER_IP = "10.100.101.100";
73+
74+
CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
75+
.withCmd("sleep", "9999")
76+
.exec();
6477

65-
CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
6678
dockerClient.startContainerCmd(container.getId()).exec();
6779

80+
try {
81+
dockerClient.removeNetworkCmd(NETWORK_NAME).exec();
82+
} catch (DockerException ignore) {
83+
}
84+
6885
CreateNetworkResponse network = dockerClient.createNetworkCmd()
69-
.withName("testNetwork")
86+
.withName(NETWORK_NAME)
7087
.withIpam(new Network.Ipam()
71-
.withConfig(new Network.Ipam.Config()
72-
.withSubnet("10.100.100.0/24")))
88+
.withConfig(new Network.Ipam.Config()
89+
.withSubnet(NETWORK_SUBNET)))
7390
.exec();
7491

7592
dockerClient.connectToNetworkCmd()
7693
.withNetworkId(network.getId())
7794
.withContainerId(container.getId())
7895
.withContainerNetwork(new ContainerNetwork()
79-
.withAliases("testing")
80-
.withIpamConfig(new ContainerNetwork.Ipam()
81-
.withIpv4Address("10.100.100.100")))
96+
.withAliases("aliasName")
97+
.withIpamConfig(new ContainerNetwork.Ipam()
98+
.withIpv4Address(CONTAINER_IP)))
8299
.exec();
83100

84101
Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
85102

86103
Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
87104
assertNotNull(containerNetworkConfig);
88-
assertEquals(containerNetworkConfig.getIpv4Address(), "10.100.100.100/24");
105+
assertThat(containerNetworkConfig.getIpv4Address(), is(CONTAINER_IP + "/24"));
89106

90107
InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
91108

92-
ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork");
109+
ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(NETWORK_NAME);
93110
assertNotNull(testNetwork);
94-
assertEquals(testNetwork.getAliases(), Collections.singletonList("testing"));
95-
assertEquals(testNetwork.getGateway(), "10.100.100.1");
96-
assertEquals(testNetwork.getIpAddress(), "10.100.100.100");
111+
assertThat(testNetwork.getAliases(), hasItem("aliasName"));
112+
assertEquals(testNetwork.getGateway(), "10.100.101.1");
113+
assertEquals(testNetwork.getIpAddress(), CONTAINER_IP);
97114
}
98115
}

0 commit comments

Comments
 (0)