cloudprovider usable filter with zone

yunionio · Jul 14, 2020 · 26757cb · 26757cb
1 parent c90420b
commit 26757cb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go
@@ -1125,7 +1125,8 @@ func (manager *SCloudproviderManager) ListItemFilter(
 			sqlchemy.Equals(vpcs.Field("manager_id"), providers.Field("id")),
 		))
 		if zone != nil {
-			sq = sq.Filter(sqlchemy.Equals(wires.Field("zone_id"), zone.GetId()))
+			zoneFilter := sqlchemy.OR(sqlchemy.Equals(wires.Field("zone_id"), zone.GetId()), sqlchemy.IsNullOrEmpty(wires.Field("zone_id")))
+			sq = sq.Filter(zoneFilter)
 		} else if region != nil {
 			sq = sq.Filter(sqlchemy.Equals(vpcs.Field("cloudregion_id"), region.GetId()))
 		}