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

Add network events.

Browse Source 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f15af1eff75f920c956e7c437d1ef81f5c31129a
Component: engine
This commit is contained in:
David Calavera
2015-12-21 23:35:30 -05:00
parent e54bb2b509
commit e32ea4c0f9
7 changed files with 73 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/api/server/router/network/backend.go
View File

@ -19,4 +19,5 @@ type Backend interface {
DisconnectContainerFromNetwork(containerName string,
network libnetwork.Network) error
NetworkControllerEnabled() bool
DeleteNetwork(name string) error
}

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

@ -148,21 +148,7 @@ 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 {
if err := httputils.ParseForm(r); err != nil {
return err
}
nw, err := n.backend.FindNetwork(vars["id"])
if err != nil {
return err
}
if runconfig.IsPreDefinedNetwork(nw.Name()) {
return httputils.WriteJSON(w, http.StatusForbidden,
fmt.Sprintf("%s is a pre-defined network and cannot be removed", nw.Name()))
}
return nw.Delete()
return n.backend.DeleteNetwork(vars["id"])
}
func buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {