From 5e562dd2bb71ebbc336771b61057ffda3c3a81f4 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 15 Apr 2019 23:30:14 +0800 Subject: [PATCH] fix: cloud account queued sync_status is overried as idle --- pkg/compute/models/cloudaccounts.go | 4 ++++ pkg/compute/models/hosts.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index ebd9e16064..0674802760 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -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() diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index a31c4aca72..366376d9be 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -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