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

elasticips: list usable eips for onecloud kvm guests

Browse Source
This commit is contained in:
Yousong Zhou
2020-05-28 15:51:20 +08:00
parent 18fe12a4a7
commit 2390e352f8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/elasticips.go
+6 -2
View File
@@ -148,7 +148,7 @@ func (manager *SElasticipManager) ListItemFilter(
return nil, httperrors.NewGeneralError(err)
}
guest := serverObj.(*SGuest)
if utils.IsInStringArray(guest.Hypervisor, api.PRIVATE_CLOUD_HYPERVISORS) {
if guest.Hypervisor == api.HYPERVISOR_KVM || utils.IsInStringArray(guest.Hypervisor, api.PRIVATE_CLOUD_HYPERVISORS) {
zone := guest.getZone()
networks := NetworkManager.Query().SubQuery()
wires := WireManager.Query().SubQuery()
@@ -161,7 +161,11 @@ func (manager *SElasticipManager) ListItemFilter(
q = q.Equals("cloudregion_id", region.Id)
}
managerId := guest.GetHost().ManagerId
q = q.Equals("manager_id", managerId)
if managerId != "" {
q = q.Equals("manager_id", managerId)
} else {
q = q.IsNullOrEmpty("manager_id")
}
default:
return nil, httperrors.NewInputParameterError("Not support associate type %s, only support %s", associateType, api.EIP_ASSOCIATE_VALID_TYPES)
}