opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #415 from swordqiu/hotfix/qj-cloud-account-queued-status-omited

Browse Source 
fix: cloud account queued sync_status is override as idle
This commit is contained in:
yunion-ci-robot
2019-04-16 00:54:09 +08:00
committed by GitHub
parent 39151ab2ab 5e562dd2bb
commit 984034c89d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+4
View File
@@ -1273,6 +1273,10 @@ func (self *SCloudaccount) StartCloudaccountDeleteTask(ctx context.Context, user
}
func (self *SCloudaccount) getSyncStatus() string {
if self.SyncStatus == api.CLOUD_PROVIDER_SYNC_STATUS_QUEUED {
return self.SyncStatus
}
cprs := CloudproviderRegionManager.Query().SubQuery()
providers := CloudproviderManager.Query().SubQuery()
pkg/compute/models/hosts.go
+1 -1
View File
@@ -3192,7 +3192,7 @@ func (self *SHost) Attach2Network(ctx context.Context, userCred mcclient.TokenCr
return err
}
if len(ipAddr) > 0 && ipAddr != freeIp && requireDesignatedIp {
return fmt.Errorf("IP address %s is occupied", ipAddr)
return fmt.Errorf("IP address %s is occupied, get %s instead", ipAddr, freeIp)
}
bn := &SHostnetwork{}
bn.BaremetalId = self.Id