docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2068 from vieux/engine_api_network_create 

use engine-api for network operations
This commit is contained in:
Nishant Totla 2016-04-01 13:53:45 -07:00
parent 2906a670a3 b300f73a45
commit ccb2bea9cf
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/handlers.go
View File

@ -591,7 +591,7 @@ func deleteContainers(c *context, w http.ResponseWriter, r *http.Request) {
// POST /networks/create // POST /networks/create
func postNetworksCreate(c *context, w http.ResponseWriter, r *http.Request) { 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 { if err := json.NewDecoder(r.Body).Decode(&request); err != nil {
httpError(w, err.Error(), http.StatusBadRequest) httpError(w, err.Error(), http.StatusBadRequest)
@ -951,7 +951,7 @@ func proxyNetworkDisconnect(c *context, w http.ResponseWriter, r *http.Request)
r.Body = ioutil.NopCloser(bytes.NewBuffer(buf)) r.Body = ioutil.NopCloser(bytes.NewBuffer(buf))
// Extract container info from r.Body copy // Extract container info from r.Body copy
var disconnect dockerclient.NetworkDisconnect var disconnect apitypes.NetworkDisconnect
if err := json.NewDecoder(bodyCopy).Decode(&disconnect); err != nil { if err := json.NewDecoder(bodyCopy).Decode(&disconnect); err != nil {
httpError(w, fmt.Sprintf("Container is not specified"), http.StatusNotFound) httpError(w, fmt.Sprintf("Container is not specified"), http.StatusNotFound)
return return
@ -1007,7 +1007,7 @@ func proxyNetworkConnect(c *context, w http.ResponseWriter, r *http.Request) {
r.Body = ioutil.NopCloser(bytes.NewBuffer(buf)) r.Body = ioutil.NopCloser(bytes.NewBuffer(buf))
// Extract container info from r.Body copy // Extract container info from r.Body copy
var connect dockerclient.NetworkConnect var connect apitypes.NetworkConnect
if err := json.NewDecoder(bodyCopy).Decode(&connect); err != nil { if err := json.NewDecoder(bodyCopy).Decode(&connect); err != nil {
httpError(w, fmt.Sprintf("Container is not specified"), http.StatusNotFound) httpError(w, fmt.Sprintf("Container is not specified"), http.StatusNotFound)
return return

2
cluster/cluster.go
View File

@ -39,7 +39,7 @@ type Cluster interface {
Networks() Networks Networks() Networks
// Create a network // Create a network
CreateNetwork(request *dockerclient.NetworkCreate) (*dockerclient.NetworkCreateResponse, error) CreateNetwork(request *types.NetworkCreate) (*types.NetworkCreateResponse, error)
// Remove a network from the cluster // Remove a network from the cluster
RemoveNetwork(network *Network) error RemoveNetwork(network *Network) error

6
cluster/engine.go
View File

@ -878,13 +878,13 @@ func (e *Engine) RemoveContainer(container *Container, force, volumes bool) erro
} }
// CreateNetwork creates a network in the engine // CreateNetwork creates a network in the engine
func (e *Engine) CreateNetwork(request *dockerclient.NetworkCreate) (*dockerclient.NetworkCreateResponse, error) { func (e *Engine) CreateNetwork(request *types.NetworkCreate) (*types.NetworkCreateResponse, error) {
response, err := e.client.CreateNetwork(request) response, err := e.apiClient.NetworkCreate(context.TODO(), *request)
e.CheckConnectionErr(err) e.CheckConnectionErr(err)
e.RefreshNetworks() e.RefreshNetworks()
return response, err return &response, err
} }
// CreateVolume creates a volume in the engine // CreateVolume creates a volume in the engine

2
cluster/mesos/cluster.go
View File

@ -254,7 +254,7 @@ func (c *Cluster) RemoveImages(name string, force bool) ([]types.ImageDelete, er
} }
// CreateNetwork creates a network in the cluster // 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 ( var (
parts = strings.SplitN(request.Name, "/", 2) parts = strings.SplitN(request.Name, "/", 2)
config = &cluster.ContainerConfig{} config = &cluster.ContainerConfig{}

2
cluster/swarm/cluster.go
View File

@ -459,7 +459,7 @@ func (c *Cluster) refreshVolumes() {
} }
// CreateNetwork creates a network in the cluster // 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 ( var (
parts = strings.SplitN(request.Name, "/", 2) parts = strings.SplitN(request.Name, "/", 2)
config = &cluster.ContainerConfig{} config = &cluster.ContainerConfig{}