toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20977 from allencloud/fix-delete-response-status-code

Browse Source 
return status code http.StatusNoContent in deleting network when OK
Upstream-commit: a04e16ac35e8dd9ec10462cccebf13cf29b49a51
Component: engine
This commit is contained in:
Brian Goff
2016-03-13 11:30:32 -04:00
parent 890088fca6 9810cad289
commit 05bbd93137
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/api/server/router/network/network_routes.go
View File

@ -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 {