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

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit '4aa4f427b66ea7c985002b31a939a300f1f83ba0':
  避免eip关联主机或解绑失败后，不能再次操作
This commit is contained in:
邱剑
2018-12-01 12:54:32 +08:00
parent 3e3b9566c3 4aa4f427b6
commit d58a7e0915
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+4 -2
View File
@@ -101,8 +101,10 @@ const (
VM_RESTORE_STATE = "restore_state"
VM_RESTORE_FAILED = "restore_failed"
VM_ASSOCIATE_EIP = "associate_eip"
VM_DISSOCIATE_EIP = "dissociate_eip"
VM_ASSOCIATE_EIP = "associate_eip"
VM_ASSOCIATE_EIP_FAILED = "associate_eip_failed"
VM_DISSOCIATE_EIP = "dissociate_eip"
VM_DISSOCIATE_EIP_FAILED = "dissociate_eip_failed"
VM_REMOVE_STATEFILE = "remove_state"
pkg/compute/tasks/eip_associate_task.go
+2 -2
View File
@@ -20,10 +20,10 @@ func init() {
}
func (self *EipAssociateTask) TaskFail(ctx context.Context, eip *models.SElasticip, msg string, vm *models.SGuest) {
eip.SetStatus(self.UserCred, models.EIP_STATUS_ASSOCIATE_FAIL, msg)
eip.SetStatus(self.UserCred, models.EIP_STATUS_READY, msg)
self.SetStageFailed(ctx, msg)
if vm != nil {
vm.StartSyncstatus(ctx, self.UserCred, "")
vm.SetStatus(self.UserCred, models.VM_ASSOCIATE_EIP_FAILED, msg)
}
}
pkg/compute/tasks/eip_dissociate_task.go
+2 -2
View File
@@ -20,10 +20,10 @@ func init() {
}
func (self *EipDissociateTask) TaskFail(ctx context.Context, eip *models.SElasticip, msg string, vm *models.SGuest) {
eip.SetStatus(self.UserCred, models.EIP_STATUS_DISSOCIATE_FAIL, msg)
eip.SetStatus(self.UserCred, models.EIP_STATUS_READY, msg)
self.SetStageFailed(ctx, msg)
if vm != nil {
vm.StartSyncstatus(ctx, self.UserCred, "")
vm.SetStatus(self.UserCred, models.VM_DISSOCIATE_EIP_FAILED, msg)
}
}