Merge pull request #11893 from ioito/automated-cherry-pick-of-#11892-upstream-release-3.7

Automated cherry pick of #11892: fix(region): hcso regional eip
This commit is contained in:
Zexi Li
2021-08-13 14:29:16 +08:00
committed by GitHub
+1 -1
View File
@@ -152,7 +152,7 @@ func (manager *SElasticipManager) ListItemFilter(
return nil, httperrors.NewGeneralError(err)
}
guest := serverObj.(*SGuest)
if guest.Hypervisor == api.HYPERVISOR_KVM || utils.IsInStringArray(guest.Hypervisor, api.PRIVATE_CLOUD_HYPERVISORS) {
if guest.Hypervisor == api.HYPERVISOR_KVM || (utils.IsInStringArray(guest.Hypervisor, api.PRIVATE_CLOUD_HYPERVISORS) && guest.Hypervisor != api.HYPERVISOR_HUAWEI_CLOUD_STACK) {
zone, _ := guest.getZone()
networks := NetworkManager.Query().SubQuery()
wires := WireManager.Query().SubQuery()