opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

make dissociate action idempotennt

Browse Source
This commit is contained in:
Qiu Jian
2019-01-16 00:55:29 +08:00
parent 1287af044f
commit c90d6b1acd
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/elasticips.go
+6 -1
View File
@@ -641,8 +641,13 @@ func (self *SElasticip) AllowPerformDissociate(ctx context.Context, userCred mcc
}
func (self *SElasticip) PerformDissociate(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
if len(self.AssociateId) == 0 {
return nil, nil // success
}
// associate with an invalid vm
if !self.IsAssociated() {
return nil, httperrors.NewConflictError("eip is not associated with instance")
return nil, self.Dissociate(ctx, userCred)
}
if self.Status != EIP_STATUS_READY {