Browse code
rename clusterProvider to cluster in router
Signed-off-by: allencloud <allen.sun@daocloud.io>
allencloud authored on 2016/12/26 21:53:13Showing 4 changed files
- api/server/router/network/network.go
- api/server/router/network/network_routes.go
- api/server/router/system/system.go
- api/server/router/system/system_routes.go
| ... | ... |
@@ -7,16 +7,16 @@ import ( |
| 7 | 7 |
|
| 8 | 8 |
// networkRouter is a router to talk with the network controller |
| 9 | 9 |
type networkRouter struct {
|
| 10 |
- backend Backend |
|
| 11 |
- clusterProvider *cluster.Cluster |
|
| 12 |
- routes []router.Route |
|
| 10 |
+ backend Backend |
|
| 11 |
+ cluster *cluster.Cluster |
|
| 12 |
+ routes []router.Route |
|
| 13 | 13 |
} |
| 14 | 14 |
|
| 15 | 15 |
// NewRouter initializes a new network router |
| 16 | 16 |
func NewRouter(b Backend, c *cluster.Cluster) router.Router {
|
| 17 | 17 |
r := &networkRouter{
|
| 18 |
- backend: b, |
|
| 19 |
- clusterProvider: c, |
|
| 18 |
+ backend: b, |
|
| 19 |
+ cluster: c, |
|
| 20 | 20 |
} |
| 21 | 21 |
r.initRoutes() |
| 22 | 22 |
return r |
| ... | ... |
@@ -27,7 +27,7 @@ func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWrit |
| 27 | 27 |
|
| 28 | 28 |
list := []types.NetworkResource{}
|
| 29 | 29 |
|
| 30 |
- if nr, err := n.clusterProvider.GetNetworks(); err == nil {
|
|
| 30 |
+ if nr, err := n.cluster.GetNetworks(); err == nil {
|
|
| 31 | 31 |
list = append(list, nr...) |
| 32 | 32 |
} |
| 33 | 33 |
|
| ... | ... |
@@ -57,7 +57,7 @@ func (n *networkRouter) getNetwork(ctx context.Context, w http.ResponseWriter, r |
| 57 | 57 |
|
| 58 | 58 |
nw, err := n.backend.FindNetwork(vars["id"]) |
| 59 | 59 |
if err != nil {
|
| 60 |
- if nr, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil {
|
|
| 60 |
+ if nr, err := n.cluster.GetNetwork(vars["id"]); err == nil {
|
|
| 61 | 61 |
return httputils.WriteJSON(w, http.StatusOK, nr) |
| 62 | 62 |
} |
| 63 | 63 |
return err |
| ... | ... |
@@ -80,7 +80,7 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr |
| 80 | 80 |
return err |
| 81 | 81 |
} |
| 82 | 82 |
|
| 83 |
- if nws, err := n.clusterProvider.GetNetworksByName(create.Name); err == nil && len(nws) > 0 {
|
|
| 83 |
+ if nws, err := n.cluster.GetNetworksByName(create.Name); err == nil && len(nws) > 0 {
|
|
| 84 | 84 |
return libnetwork.NetworkNameError(create.Name) |
| 85 | 85 |
} |
| 86 | 86 |
|
| ... | ... |
@@ -89,7 +89,7 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr |
| 89 | 89 |
if _, ok := err.(libnetwork.ManagerRedirectError); !ok {
|
| 90 | 90 |
return err |
| 91 | 91 |
} |
| 92 |
- id, err := n.clusterProvider.CreateNetwork(create) |
|
| 92 |
+ id, err := n.cluster.CreateNetwork(create) |
|
| 93 | 93 |
if err != nil {
|
| 94 | 94 |
return err |
| 95 | 95 |
} |
| ... | ... |
@@ -137,8 +137,8 @@ func (n *networkRouter) deleteNetwork(ctx context.Context, w http.ResponseWriter |
| 137 | 137 |
if err := httputils.ParseForm(r); err != nil {
|
| 138 | 138 |
return err |
| 139 | 139 |
} |
| 140 |
- if _, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil {
|
|
| 141 |
- if err = n.clusterProvider.RemoveNetwork(vars["id"]); err != nil {
|
|
| 140 |
+ if _, err := n.cluster.GetNetwork(vars["id"]); err == nil {
|
|
| 141 |
+ if err = n.cluster.RemoveNetwork(vars["id"]); err != nil {
|
|
| 142 | 142 |
return err |
| 143 | 143 |
} |
| 144 | 144 |
w.WriteHeader(http.StatusNoContent) |
| ... | ... |
@@ -162,8 +162,8 @@ func (n *networkRouter) buildNetworkResource(nw libnetwork.Network) *types.Netwo |
| 162 | 162 |
r.ID = nw.ID() |
| 163 | 163 |
r.Created = info.Created() |
| 164 | 164 |
r.Scope = info.Scope() |
| 165 |
- if n.clusterProvider.IsManager() {
|
|
| 166 |
- if _, err := n.clusterProvider.GetNetwork(nw.Name()); err == nil {
|
|
| 165 |
+ if n.cluster.IsManager() {
|
|
| 166 |
+ if _, err := n.cluster.GetNetwork(nw.Name()); err == nil {
|
|
| 167 | 167 |
r.Scope = "swarm" |
| 168 | 168 |
} |
| 169 | 169 |
} else if info.Dynamic() {
|
| ... | ... |
@@ -8,16 +8,16 @@ import ( |
| 8 | 8 |
// systemRouter provides information about the Docker system overall. |
| 9 | 9 |
// It gathers information about host, daemon and container events. |
| 10 | 10 |
type systemRouter struct {
|
| 11 |
- backend Backend |
|
| 12 |
- clusterProvider *cluster.Cluster |
|
| 13 |
- routes []router.Route |
|
| 11 |
+ backend Backend |
|
| 12 |
+ cluster *cluster.Cluster |
|
| 13 |
+ routes []router.Route |
|
| 14 | 14 |
} |
| 15 | 15 |
|
| 16 | 16 |
// NewRouter initializes a new system router |
| 17 | 17 |
func NewRouter(b Backend, c *cluster.Cluster) router.Router {
|
| 18 | 18 |
r := &systemRouter{
|
| 19 |
- backend: b, |
|
| 20 |
- clusterProvider: c, |
|
| 19 |
+ backend: b, |
|
| 20 |
+ cluster: c, |
|
| 21 | 21 |
} |
| 22 | 22 |
|
| 23 | 23 |
r.routes = []router.Route{
|
| ... | ... |
@@ -35,8 +35,8 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht |
| 35 | 35 |
if err != nil {
|
| 36 | 36 |
return err |
| 37 | 37 |
} |
| 38 |
- if s.clusterProvider != nil {
|
|
| 39 |
- info.Swarm = s.clusterProvider.Info() |
|
| 38 |
+ if s.cluster != nil {
|
|
| 39 |
+ info.Swarm = s.cluster.Info() |
|
| 40 | 40 |
} |
| 41 | 41 |
|
| 42 | 42 |
if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") {
|