From 5e13bcf8ffdb4a8833f775d27f8214758d1682ca Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 25 Mar 2016 15:35:04 -0700 Subject: [PATCH 1/2] use engine-api for network create Signed-off-by: Victor Vieux --- api/handlers.go | 2 +- cluster/cluster.go | 2 +- cluster/engine.go | 6 +++--- cluster/mesos/cluster.go | 2 +- cluster/swarm/cluster.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/handlers.go b/api/handlers.go index a2d002d944..01b1dfc93d 100644 --- a/api/handlers.go +++ b/api/handlers.go @@ -591,7 +591,7 @@ func deleteContainers(c *context, w http.ResponseWriter, r *http.Request) { // POST /networks/create func postNetworksCreate(c *context, w http.ResponseWriter, r *http.Request) { - var request dockerclient.NetworkCreate + var request apitypes.NetworkCreate if err := json.NewDecoder(r.Body).Decode(&request); err != nil { httpError(w, err.Error(), http.StatusBadRequest) diff --git a/cluster/cluster.go b/cluster/cluster.go index 4c301c6e3b..aa13d15965 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -39,7 +39,7 @@ type Cluster interface { Networks() Networks // Create a network - CreateNetwork(request *dockerclient.NetworkCreate) (*dockerclient.NetworkCreateResponse, error) + CreateNetwork(request *types.NetworkCreate) (*types.NetworkCreateResponse, error) // Remove a network from the cluster RemoveNetwork(network *Network) error diff --git a/cluster/engine.go b/cluster/engine.go index f5db8ec6ca..b47eda94a8 100644 --- a/cluster/engine.go +++ b/cluster/engine.go @@ -878,13 +878,13 @@ func (e *Engine) RemoveContainer(container *Container, force, volumes bool) erro } // CreateNetwork creates a network in the engine -func (e *Engine) CreateNetwork(request *dockerclient.NetworkCreate) (*dockerclient.NetworkCreateResponse, error) { - response, err := e.client.CreateNetwork(request) +func (e *Engine) CreateNetwork(request *types.NetworkCreate) (*types.NetworkCreateResponse, error) { + response, err := e.apiClient.NetworkCreate(context.TODO(), *request) e.CheckConnectionErr(err) e.RefreshNetworks() - return response, err + return &response, err } // CreateVolume creates a volume in the engine diff --git a/cluster/mesos/cluster.go b/cluster/mesos/cluster.go index fe66a84164..92166c99e3 100644 --- a/cluster/mesos/cluster.go +++ b/cluster/mesos/cluster.go @@ -254,7 +254,7 @@ func (c *Cluster) RemoveImages(name string, force bool) ([]types.ImageDelete, er } // CreateNetwork creates a network in the cluster -func (c *Cluster) CreateNetwork(request *dockerclient.NetworkCreate) (*dockerclient.NetworkCreateResponse, error) { +func (c *Cluster) CreateNetwork(request *types.NetworkCreate) (*types.NetworkCreateResponse, error) { var ( parts = strings.SplitN(request.Name, "/", 2) config = &cluster.ContainerConfig{} diff --git a/cluster/swarm/cluster.go b/cluster/swarm/cluster.go index b966b4f773..a6910dc1de 100644 --- a/cluster/swarm/cluster.go +++ b/cluster/swarm/cluster.go @@ -459,7 +459,7 @@ func (c *Cluster) refreshVolumes() { } // CreateNetwork creates a network in the cluster -func (c *Cluster) CreateNetwork(request *dockerclient.NetworkCreate) (response *dockerclient.NetworkCreateResponse, err error) { +func (c *Cluster) CreateNetwork(request *types.NetworkCreate) (response *types.NetworkCreateResponse, err error) { var ( parts = strings.SplitN(request.Name, "/", 2) config = &cluster.ContainerConfig{} From b300f73a45d8da158bc4601f4950ecff3d7ec2c8 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 25 Mar 2016 15:40:37 -0700 Subject: [PATCH 2/2] more network Signed-off-by: Victor Vieux --- api/handlers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/handlers.go b/api/handlers.go index 01b1dfc93d..8bc29ea1de 100644 --- a/api/handlers.go +++ b/api/handlers.go @@ -951,7 +951,7 @@ func proxyNetworkDisconnect(c *context, w http.ResponseWriter, r *http.Request) r.Body = ioutil.NopCloser(bytes.NewBuffer(buf)) // Extract container info from r.Body copy - var disconnect dockerclient.NetworkDisconnect + var disconnect apitypes.NetworkDisconnect if err := json.NewDecoder(bodyCopy).Decode(&disconnect); err != nil { httpError(w, fmt.Sprintf("Container is not specified"), http.StatusNotFound) return @@ -1007,7 +1007,7 @@ func proxyNetworkConnect(c *context, w http.ResponseWriter, r *http.Request) { r.Body = ioutil.NopCloser(bytes.NewBuffer(buf)) // Extract container info from r.Body copy - var connect dockerclient.NetworkConnect + var connect apitypes.NetworkConnect if err := json.NewDecoder(bodyCopy).Decode(&connect); err != nil { httpError(w, fmt.Sprintf("Container is not specified"), http.StatusNotFound) return