Merge pull request #1 from docker-java/issue-356

akeely · akeely · commit c73c82718d75 · 2016-01-10T14:28:08.000-05:00
Added tests for ListNetworksCmd
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -29,6 +29,7 @@
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
@@ -200,6 +201,8 @@ public interface DockerClient extends Closeable {
 
     public ListVolumesCmd listVolumesCmd();
 
+    public ListNetworksCmd listNetworksCmd();
+
     @Override
     public void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -31,6 +31,7 @@
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
@@ -75,6 +76,7 @@
 import com.github.dockerjava.core.command.KillContainerCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
+import com.github.dockerjava.core.command.ListNetworksCmdImpl;
 import com.github.dockerjava.core.command.ListVolumesCmdImpl;
 import com.github.dockerjava.core.command.LogContainerCmdImpl;
 import com.github.dockerjava.core.command.PauseContainerCmdImpl;
@@ -417,6 +419,11 @@ public ListVolumesCmd listVolumesCmd() {
         return new ListVolumesCmdImpl(getDockerCmdExecFactory().createListVolumesCmdExec());
     }
 
+    @Override
+    public ListNetworksCmd listNetworksCmd() {
+        return new ListNetworksCmdImpl(getDockerCmdExecFactory().createListNetworksCmdExec());
+    }
+
     @Override
     public void close() throws IOException {
         getDockerCmdExecFactory().close();
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
@@ -24,7 +24,7 @@ public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClie
 
     @Override
     protected List<Network> execute(ListNetworksCmd command) {
-        WebTarget webTarget = getBaseResource().path("/volumes");
+        WebTarget webTarget = getBaseResource().path("/networks");
 
         if (command.getFilters() != null)
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
diff --git a/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+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 com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class ListNetworksCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listNetworks() throws DockerException {
+
+        List<Network> networks = dockerClient.listNetworksCmd().exec();
+
+        Network network = networks.get(0);
+
+        assertThat(network.getName(), equalTo("bridge"));
+        assertThat(network.getScope(), equalTo("local"));
+        assertThat(network.getDriver(), equalTo("bridge"));
+        assertThat(network.getIpam().getDriver(), equalTo("default"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+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 com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+@Test(groups = "integration")
+public class ListNetworksCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listNetworks() throws DockerException {
+
+        List<Network> networks = dockerClient.listNetworksCmd().exec();
+
+        Network network = networks.get(0);
+
+        assertThat(network.getName(), equalTo("bridge"));
+        assertThat(network.getScope(), equalTo("local"));
+        assertThat(network.getDriver(), equalTo("bridge"));
+        assertThat(network.getIpam().getDriver(), equalTo("default"));
+    }
+}
