1.return status code http.StatusNoContent in deleting network when successful

allencloud · allencloud · commit 94c929099fdf · 2016-03-10T00:28:55.000+08:00
2.modify docker_api_network_test.go
3.modify docker_remote_api_v1.23.md

Signed-off-by: allencloud &lt;allen.sun@daocloud.io&gt;
diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go
@@ -147,7 +147,14 @@ func (n *networkRouter) postNetworkDisconnect(ctx context.Context, w http.Respon
 }
 
 func (n *networkRouter) deleteNetwork(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	return n.backend.DeleteNetwork(vars["id"])
+	if err := httputils.ParseForm(r); err != nil {
+		return err
+	}
+	if err := n.backend.DeleteNetwork(vars["id"]); err != nil {
+		return err
+	}
+	w.WriteHeader(http.StatusNoContent)
+	return nil
 }
 
 func buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {
diff --git a/docs/reference/api/docker_remote_api_v1.23.md b/docs/reference/api/docker_remote_api_v1.23.md
@@ -3097,7 +3097,7 @@ JSON Parameters:
 
 `POST /networks/(id)/connect`
 
-Connects a container to a network
+Connect a container to a network
 
 **Example request**:
 
@@ -3134,7 +3134,7 @@ JSON Parameters:
 
 `POST /networks/(id)/disconnect`
 
-Disconnects a container from a network
+Disconnect a container from a network
 
 **Example request**:
 
@@ -3175,11 +3175,11 @@ Instruct the driver to remove the network (`id`).
 
 **Example response**:
 
-    HTTP/1.1 200 OK
+    HTTP/1.1 204 No Content
 
 Status Codes
 
--   **200** - no error
+-   **204** - no error
 -   **404** - no such network
 -   **500** - server error
 
diff --git a/integration-cli/docker_api_network_test.go b/integration-cli/docker_api_network_test.go
@@ -332,6 +332,6 @@ func deleteNetwork(c *check.C, id string, shouldSucceed bool) {
 		c.Assert(status, checker.Not(checker.Equals), http.StatusOK)
 		return
 	}
-	c.Assert(status, checker.Equals, http.StatusOK)
+	c.Assert(status, checker.Equals, http.StatusNoContent)
 	c.Assert(err, checker.IsNil)
 }

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,14 @@ func (n *networkRouter) postNetworkDisconnect(ctx context.Context, w http.Respon`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`func (n networkRouter) deleteNetwork(ctx context.Context, w http.ResponseWriter, r http.Request, vars map[string]string) error {`
`150`		`- return n.backend.DeleteNetwork(vars["id"])`
	`150`	`+ if err := httputils.ParseForm(r); err != nil {`
	`151`	`+ return err`
	`152`	`+ }`
	`153`	`+ if err := n.backend.DeleteNetwork(vars["id"]); err != nil {`
	`154`	`+ return err`
	`155`	`+ }`
	`156`	`+ w.WriteHeader(http.StatusNoContent)`
	`157`	`+ return nil`
`151`	`158`	`}`
`152`	`159`
`153`	`160`	`func buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {`
Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,6 @@ func deleteNetwork(c *check.C, id string, shouldSucceed bool) {`
`332`	`332`	`c.Assert(status, checker.Not(checker.Equals), http.StatusOK)`
`333`	`333`	`return`
`334`	`334`	`}`
`335`		`- c.Assert(status, checker.Equals, http.StatusOK)`
	`335`	`+ c.Assert(status, checker.Equals, http.StatusNoContent)`
`336`	`336`	`c.Assert(err, checker.IsNil)`
`337`	`337`	`}`