kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #29705 from allencloud/rename-clusterProvider-to-cluster

Browse source 
rename clusterProvider to cluster in router
This commit is contained in:
Vincent Demeester 2016-12-27 09:34:17 +01:00 • committed by GitHub
commit 1474bf6c6e
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/server/router/network/network.go
View file

@ -8,7 +8,7 @@ import (
// networkRouter is a router to talk with the network controller // networkRouter is a router to talk with the network controller
type networkRouter struct { type networkRouter struct {
backend Backend backend Backend
clusterProvider *cluster.Cluster cluster *cluster.Cluster
routes []router.Route routes []router.Route
} }
@ -16,7 +16,7 @@ type networkRouter struct {
func NewRouter(b Backend, c *cluster.Cluster) router.Router { func NewRouter(b Backend, c *cluster.Cluster) router.Router {
r := &networkRouter{ r := &networkRouter{
backend: b, backend: b,
clusterProvider: c, cluster: c,
} }
r.initRoutes() r.initRoutes()
return r return r

16
api/server/router/network/network_routes.go
View file

@ -27,7 +27,7 @@ func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWrit
list := []types.NetworkResource{} list := []types.NetworkResource{}
if nr, err := n.clusterProvider.GetNetworks(); err == nil { if nr, err := n.cluster.GetNetworks(); err == nil {
list = append(list, nr...) list = append(list, nr...)
} }
@ -57,7 +57,7 @@ func (n *networkRouter) getNetwork(ctx context.Context, w http.ResponseWriter, r
nw, err := n.backend.FindNetwork(vars["id"]) nw, err := n.backend.FindNetwork(vars["id"])
if err != nil { if err != nil {
if nr, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil { if nr, err := n.cluster.GetNetwork(vars["id"]); err == nil {
return httputils.WriteJSON(w, http.StatusOK, nr) return httputils.WriteJSON(w, http.StatusOK, nr)
} }
return err return err
@ -80,7 +80,7 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr
return err return err
} }
if nws, err := n.clusterProvider.GetNetworksByName(create.Name); err == nil && len(nws) > 0 { if nws, err := n.cluster.GetNetworksByName(create.Name); err == nil && len(nws) > 0 {
return libnetwork.NetworkNameError(create.Name) return libnetwork.NetworkNameError(create.Name)
} }
@ -89,7 +89,7 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr
if _, ok := err.(libnetwork.ManagerRedirectError); !ok { if _, ok := err.(libnetwork.ManagerRedirectError); !ok {
return err return err
} }
id, err := n.clusterProvider.CreateNetwork(create) id, err := n.cluster.CreateNetwork(create)
if err != nil { if err != nil {
return err return err
} }
@ -137,8 +137,8 @@ func (n *networkRouter) deleteNetwork(ctx context.Context, w http.ResponseWriter
if err := httputils.ParseForm(r); err != nil { if err := httputils.ParseForm(r); err != nil {
return err return err
} }
if _, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil { if _, err := n.cluster.GetNetwork(vars["id"]); err == nil {
if err = n.clusterProvider.RemoveNetwork(vars["id"]); err != nil { if err = n.cluster.RemoveNetwork(vars["id"]); err != nil {
return err return err
} }
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
@ -162,8 +162,8 @@ func (n *networkRouter) buildNetworkResource(nw libnetwork.Network) *types.Netwo
r.ID = nw.ID() r.ID = nw.ID()
r.Created = info.Created() r.Created = info.Created()
r.Scope = info.Scope() r.Scope = info.Scope()
if n.clusterProvider.IsManager() { if n.cluster.IsManager() {
if _, err := n.clusterProvider.GetNetwork(nw.Name()); err == nil { if _, err := n.cluster.GetNetwork(nw.Name()); err == nil {
r.Scope = "swarm" r.Scope = "swarm"
} }
} else if info.Dynamic() { } else if info.Dynamic() {

4
api/server/router/system/system.go
View file

@ -9,7 +9,7 @@ import (
// It gathers information about host, daemon and container events. // It gathers information about host, daemon and container events.
type systemRouter struct { type systemRouter struct {
backend Backend backend Backend
clusterProvider *cluster.Cluster cluster *cluster.Cluster
routes []router.Route routes []router.Route
} }
@ -17,7 +17,7 @@ type systemRouter struct {
func NewRouter(b Backend, c *cluster.Cluster) router.Router { func NewRouter(b Backend, c *cluster.Cluster) router.Router {
r := &systemRouter{ r := &systemRouter{
backend: b, backend: b,
clusterProvider: c, cluster: c,
} }
r.routes = []router.Route{ r.routes = []router.Route{

4
api/server/router/system/system_routes.go
View file

@ -35,8 +35,8 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht
if err != nil { if err != nil {
return err return err
} }
if s.clusterProvider != nil { if s.cluster != nil {
info.Swarm = s.clusterProvider.Info() info.Swarm = s.cluster.Info()
} }
if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") { if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") {