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
commit d9abab6ca9
4 changed files with 8 additions and 9 deletions

View File

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

View File

@ -945,17 +945,16 @@ func (e *Engine) CreateNetwork(name string, request *types.NetworkCreate) (*type
}
// 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)
e.RefreshVolumes()
e.CheckConnectionErr(err)
if err != nil {
return nil, err
}
return &Volume{Volume: volume, Engine: e}, nil
e.RefreshVolumes()
return &volume, err
}
// encodeAuthToBase64 serializes the auth configuration as JSON base64 payload

View File

@ -301,7 +301,7 @@ func (c *Cluster) refreshNetworks() {
}
// 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
}

View File

@ -494,10 +494,10 @@ func (c *Cluster) CreateNetwork(name string, request *types.NetworkCreate) (resp
}
// 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 (
wg sync.WaitGroup
volume *cluster.Volume
volume *types.Volume
err error
parts = strings.SplitN(request.Name, "/", 2)
node = ""