From 0238e9e92bd8a2bdc805578b18bc342b1c482a85 Mon Sep 17 00:00:00 2001
From: allencloud <allen.sun@daocloud.io>
Date: Mon, 26 Dec 2016 20:53:13 +0800
Subject: [PATCH] rename clusterProvider to cluster in router

Signed-off-by: allencloud <allen.sun@daocloud.io>
---
 api/server/router/network/network.go        | 10 +++++-----
 api/server/router/network/network_routes.go | 16 ++++++++--------
 api/server/router/system/system.go          | 10 +++++-----
 api/server/router/system/system_routes.go   |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/api/server/router/network/network.go b/api/server/router/network/network.go
index 08a5c8c6a6..bc613a0ed3 100644
--- a/api/server/router/network/network.go
+++ b/api/server/router/network/network.go
@@ -7,16 +7,16 @@ import (
 
 // networkRouter is a router to talk with the network controller
 type networkRouter struct {
-	backend         Backend
-	clusterProvider *cluster.Cluster
-	routes          []router.Route
+	backend Backend
+	cluster *cluster.Cluster
+	routes  []router.Route
 }
 
 // NewRouter initializes a new network router
 func NewRouter(b Backend, c *cluster.Cluster) router.Router {
 	r := &networkRouter{
-		backend:         b,
-		clusterProvider: c,
+		backend: b,
+		cluster: c,
 	}
 	r.initRoutes()
 	return r
diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go
index 8bf51a6304..1ea647a891 100644
--- a/api/server/router/network/network_routes.go
+++ b/api/server/router/network/network_routes.go
@@ -27,7 +27,7 @@ func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWrit
 
 	list := []types.NetworkResource{}
 
-	if nr, err := n.clusterProvider.GetNetworks(); err == nil {
+	if nr, err := n.cluster.GetNetworks(); err == nil {
 		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"])
 	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 err
@@ -80,7 +80,7 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr
 		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)
 	}
 
@@ -89,7 +89,7 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr
 		if _, ok := err.(libnetwork.ManagerRedirectError); !ok {
 			return err
 		}
-		id, err := n.clusterProvider.CreateNetwork(create)
+		id, err := n.cluster.CreateNetwork(create)
 		if err != nil {
 			return err
 		}
@@ -137,8 +137,8 @@ func (n *networkRouter) deleteNetwork(ctx context.Context, w http.ResponseWriter
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
-	if _, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil {
-		if err = n.clusterProvider.RemoveNetwork(vars["id"]); err != nil {
+	if _, err := n.cluster.GetNetwork(vars["id"]); err == nil {
+		if err = n.cluster.RemoveNetwork(vars["id"]); err != nil {
 			return err
 		}
 		w.WriteHeader(http.StatusNoContent)
@@ -162,8 +162,8 @@ func (n *networkRouter) buildNetworkResource(nw libnetwork.Network) *types.Netwo
 	r.ID = nw.ID()
 	r.Created = info.Created()
 	r.Scope = info.Scope()
-	if n.clusterProvider.IsManager() {
-		if _, err := n.clusterProvider.GetNetwork(nw.Name()); err == nil {
+	if n.cluster.IsManager() {
+		if _, err := n.cluster.GetNetwork(nw.Name()); err == nil {
 			r.Scope = "swarm"
 		}
 	} else if info.Dynamic() {
diff --git a/api/server/router/system/system.go b/api/server/router/system/system.go
index ed23d3bdee..44231d964c 100644
--- a/api/server/router/system/system.go
+++ b/api/server/router/system/system.go
@@ -8,16 +8,16 @@ import (
 // systemRouter provides information about the Docker system overall.
 // It gathers information about host, daemon and container events.
 type systemRouter struct {
-	backend         Backend
-	clusterProvider *cluster.Cluster
-	routes          []router.Route
+	backend Backend
+	cluster *cluster.Cluster
+	routes  []router.Route
 }
 
 // NewRouter initializes a new system router
 func NewRouter(b Backend, c *cluster.Cluster) router.Router {
 	r := &systemRouter{
-		backend:         b,
-		clusterProvider: c,
+		backend: b,
+		cluster: c,
 	}
 
 	r.routes = []router.Route{
diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go
index 0d851b684a..bb7853927d 100644
--- a/api/server/router/system/system_routes.go
+++ b/api/server/router/system/system_routes.go
@@ -35,8 +35,8 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht
 	if err != nil {
 		return err
 	}
-	if s.clusterProvider != nil {
-		info.Swarm = s.clusterProvider.Info()
+	if s.cluster != nil {
+		info.Swarm = s.cluster.Info()
 	}
 
 	if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") {