Merge pull request #4159 from ioito/hotfix/qx-host-list-filter

fix: 增强host-list --usable限制
This commit is contained in:
yunion-ci-robot
2019-12-14 10:52:00 +08:00
committed by GitHub
+4
View File
@@ -329,6 +329,10 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
sqlchemy.In(q.Field("id"), hostQ1.SubQuery()),
sqlchemy.In(q.Field("id"), hostQ2.SubQuery()),
))
zones := ZoneManager.Query().SubQuery()
q = q.Join(zones, sqlchemy.Equals(q.Field("zone_id"), zones.Field("id"))).
Filter(sqlchemy.Equals(zones.Field("status"), api.ZONE_ENABLE))
}
if query.Contains("is_empty") {