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

Merge pull request #2261 from allencloud/remove-engine-in-volume-create-response 

remove engine details in POST /volumes/create API
This commit is contained in:
Allen Sun 2016-06-04 11:48:14 +08:00
parent de6f09e5b7 d7241f3682
commit d9abab6ca9
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/cluster.go
View File

@ -45,7 +45,7 @@ type Cluster interface {
RemoveNetwork(network *Network) error RemoveNetwork(network *Network) error
// Create a volume // Create a volume
CreateVolume(request *types.VolumeCreateRequest) (*Volume, error) CreateVolume(request *types.VolumeCreateRequest) (*types.Volume, error)
// Return all volumes // Return all volumes
Volumes() Volumes Volumes() Volumes

9
cluster/engine.go
View File

@ -945,17 +945,16 @@ func (e *Engine) CreateNetwork(name string, request *types.NetworkCreate) (*type
} }
// CreateVolume creates a volume in the engine // CreateVolume creates a volume in the engine
func (e *Engine) CreateVolume(request *types.VolumeCreateRequest) (*Volume, error) { func (e *Engine) CreateVolume(request *types.VolumeCreateRequest) (*types.Volume, error) {
volume, err := e.apiClient.VolumeCreate(context.Background(), *request) volume, err := e.apiClient.VolumeCreate(context.Background(), *request)
e.RefreshVolumes()
e.CheckConnectionErr(err) e.CheckConnectionErr(err)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &Volume{Volume: volume, Engine: e}, nil
e.RefreshVolumes()
return &volume, err
} }
// encodeAuthToBase64 serializes the auth configuration as JSON base64 payload // encodeAuthToBase64 serializes the auth configuration as JSON base64 payload

2
cluster/mesos/cluster.go
View File

@ -301,7 +301,7 @@ func (c *Cluster) refreshNetworks() {
} }
// CreateVolume creates a volume in the cluster // CreateVolume creates a volume in the cluster
func (c *Cluster) CreateVolume(request *types.VolumeCreateRequest) (*cluster.Volume, error) { func (c *Cluster) CreateVolume(request *types.VolumeCreateRequest) (*types.Volume, error) {
return nil, errNotSupported return nil, errNotSupported
} }

4
cluster/swarm/cluster.go
View File

@ -494,10 +494,10 @@ func (c *Cluster) CreateNetwork(name string, request *types.NetworkCreate) (resp
} }
// CreateVolume creates a volume in the cluster // CreateVolume creates a volume in the cluster
func (c *Cluster) CreateVolume(request *types.VolumeCreateRequest) (*cluster.Volume, error) { func (c *Cluster) CreateVolume(request *types.VolumeCreateRequest) (*types.Volume, error) {
var ( var (
wg sync.WaitGroup wg sync.WaitGroup
volume *cluster.Volume volume *types.Volume
err error err error
parts = strings.SplitN(request.Name, "/", 2) parts = strings.SplitN(request.Name, "/", 2)
node = "" node = ""