diff --git a/libnetwork/api/api.go b/libnetwork/api/api.go index 42f16724be..852a18124c 100644 --- a/libnetwork/api/api.go +++ b/libnetwork/api/api.go @@ -100,7 +100,7 @@ func (h *httpHandler) initRouter() { "DELETE": { {"/networks/" + nwID, nil, procDeleteNetwork}, {"/networks/" + nwID + "/endpoints/" + epID, nil, procDeleteEndpoint}, - {"/networks/id/" + nwID + "/endpoints/" + epID + "/containers/" + cnID, nil, procLeaveEndpoint}, + {"/networks/" + nwID + "/endpoints/" + epID + "/containers/" + cnID, nil, procLeaveEndpoint}, }, } @@ -111,6 +111,11 @@ func (h *httpHandler) initRouter() { if route.qrs != nil { r.Queries(route.qrs...) } + + r = h.r.Path(route.url).Methods(method).HandlerFunc(makeHandler(h.c, route.fct)) + if route.qrs != nil { + r.Queries(route.qrs...) + } } } } diff --git a/libnetwork/cmd/dnet/dnet.go b/libnetwork/cmd/dnet/dnet.go index 8c599249a1..90ec6ff393 100644 --- a/libnetwork/cmd/dnet/dnet.go +++ b/libnetwork/cmd/dnet/dnet.go @@ -115,6 +115,8 @@ func (d *dnetConnection) dnetDaemon() error { r := mux.NewRouter().StrictSlash(false) post := r.PathPrefix("/{.*}/networks").Subrouter() post.Methods("GET", "PUT", "POST", "DELETE").HandlerFunc(httpHandler) + post = r.PathPrefix("/networks").Subrouter() + post.Methods("GET", "PUT", "POST", "DELETE").HandlerFunc(httpHandler) return http.ListenAndServe(d.addr, r) } @@ -141,7 +143,7 @@ func (d *dnetConnection) httpCall(method, path string, data interface{}, headers return nil, -1, err } - req, err := http.NewRequest(method, fmt.Sprintf("/dnet%s", path), in) + req, err := http.NewRequest(method, fmt.Sprintf("%s", path), in) if err != nil { return nil, -1, err }