Skip to content

Commit c73c827

Browse files
akeelyakeely
committed
Merge pull request #1 from docker-java/issue-356
Added tests for ListNetworksCmd
2 parents 4c9da61 + cc3843e commit c73c827

5 files changed

Lines changed: 121 additions & 1 deletion

File tree

‎src/main/java/com/github/dockerjava/api/DockerClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.github.dockerjava.api.command.KillContainerCmd;
3030
import com.github.dockerjava.api.command.ListContainersCmd;
3131
import com.github.dockerjava.api.command.ListImagesCmd;
32+
import com.github.dockerjava.api.command.ListNetworksCmd;
3233
import com.github.dockerjava.api.command.ListVolumesCmd;
3334
import com.github.dockerjava.api.command.LogContainerCmd;
3435
import com.github.dockerjava.api.command.PauseContainerCmd;
@@ -200,6 +201,8 @@ public interface DockerClient extends Closeable {
200201

201202
public ListVolumesCmd listVolumesCmd();
202203

204+
public ListNetworksCmd listNetworksCmd();
205+
203206
@Override
204207
public void close() throws IOException;
205208

‎src/main/java/com/github/dockerjava/core/DockerClientImpl.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.github.dockerjava.api.command.KillContainerCmd;
3232
import com.github.dockerjava.api.command.ListContainersCmd;
3333
import com.github.dockerjava.api.command.ListImagesCmd;
34+
import com.github.dockerjava.api.command.ListNetworksCmd;
3435
import com.github.dockerjava.api.command.ListVolumesCmd;
3536
import com.github.dockerjava.api.command.LogContainerCmd;
3637
import com.github.dockerjava.api.command.PauseContainerCmd;
@@ -75,6 +76,7 @@
7576
import com.github.dockerjava.core.command.KillContainerCmdImpl;
7677
import com.github.dockerjava.core.command.ListContainersCmdImpl;
7778
import com.github.dockerjava.core.command.ListImagesCmdImpl;
79+
import com.github.dockerjava.core.command.ListNetworksCmdImpl;
7880
import com.github.dockerjava.core.command.ListVolumesCmdImpl;
7981
import com.github.dockerjava.core.command.LogContainerCmdImpl;
8082
import com.github.dockerjava.core.command.PauseContainerCmdImpl;
@@ -417,6 +419,11 @@ public ListVolumesCmd listVolumesCmd() {
417419
return new ListVolumesCmdImpl(getDockerCmdExecFactory().createListVolumesCmdExec());
418420
}
419421

422+
@Override
423+
public ListNetworksCmd listNetworksCmd() {
424+
return new ListNetworksCmdImpl(getDockerCmdExecFactory().createListNetworksCmdExec());
425+
}
426+
420427
@Override
421428
public void close() throws IOException {
422429
getDockerCmdExecFactory().close();

‎src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClie
2424

2525
@Override
2626
protected List<Network> execute(ListNetworksCmd command) {
27-
WebTarget webTarget = getBaseResource().path("/volumes");
27+
WebTarget webTarget = getBaseResource().path("/networks");
2828

2929
if (command.getFilters() != null)
3030
webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
package com.github.dockerjava.core.command;
2+
3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.equalTo;
5+
6+
import java.lang.reflect.Method;
7+
import java.util.List;
8+
9+
import org.testng.ITestResult;
10+
import org.testng.annotations.AfterMethod;
11+
import org.testng.annotations.AfterTest;
12+
import org.testng.annotations.BeforeMethod;
13+
import org.testng.annotations.BeforeTest;
14+
import org.testng.annotations.Test;
15+
16+
import com.github.dockerjava.api.exception.DockerException;
17+
import com.github.dockerjava.api.model.Network;
18+
import com.github.dockerjava.client.AbstractDockerClientTest;
19+
20+
@Test(groups = "integration")
21+
public class ListNetworksCmdImplTest extends AbstractDockerClientTest {
22+
23+
@BeforeTest
24+
public void beforeTest() throws Exception {
25+
super.beforeTest();
26+
}
27+
28+
@AfterTest
29+
public void afterTest() {
30+
super.afterTest();
31+
}
32+
33+
@BeforeMethod
34+
public void beforeMethod(Method method) {
35+
super.beforeMethod(method);
36+
}
37+
38+
@AfterMethod
39+
public void afterMethod(ITestResult result) {
40+
super.afterMethod(result);
41+
}
42+
43+
@Test
44+
public void listNetworks() throws DockerException {
45+
46+
List<Network> networks = dockerClient.listNetworksCmd().exec();
47+
48+
Network network = networks.get(0);
49+
50+
assertThat(network.getName(), equalTo("bridge"));
51+
assertThat(network.getScope(), equalTo("local"));
52+
assertThat(network.getDriver(), equalTo("bridge"));
53+
assertThat(network.getIpam().getDriver(), equalTo("default"));
54+
}
55+
}

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
package com.github.dockerjava.netty.exec;
2+
3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.equalTo;
5+
6+
import java.lang.reflect.Method;
7+
import java.util.List;
8+
9+
import org.testng.ITestResult;
10+
import org.testng.annotations.AfterMethod;
11+
import org.testng.annotations.AfterTest;
12+
import org.testng.annotations.BeforeMethod;
13+
import org.testng.annotations.BeforeTest;
14+
import org.testng.annotations.Test;
15+
16+
import com.github.dockerjava.api.exception.DockerException;
17+
import com.github.dockerjava.api.model.Network;
18+
import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
19+
20+
@Test(groups = "integration")
21+
public class ListNetworksCmdExecTest extends AbstractNettyDockerClientTest {
22+
23+
@BeforeTest
24+
public void beforeTest() throws Exception {
25+
super.beforeTest();
26+
}
27+
28+
@AfterTest
29+
public void afterTest() {
30+
super.afterTest();
31+
}
32+
33+
@BeforeMethod
34+
public void beforeMethod(Method method) {
35+
super.beforeMethod(method);
36+
}
37+
38+
@AfterMethod
39+
public void afterMethod(ITestResult result) {
40+
super.afterMethod(result);
41+
}
42+
43+
@Test
44+
public void listNetworks() throws DockerException {
45+
46+
List<Network> networks = dockerClient.listNetworksCmd().exec();
47+
48+
Network network = networks.get(0);
49+
50+
assertThat(network.getName(), equalTo("bridge"));
51+
assertThat(network.getScope(), equalTo("local"));
52+
assertThat(network.getDriver(), equalTo("bridge"));
53+
assertThat(network.getIpam().getDriver(), equalTo("default"));
54+
}
55+
}

0 commit comments

Comments
 (0)