opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit 'ea1bbc2444f8682991c97e95db85d9fc69797c61':
  capabilities 可用storage过滤
This commit is contained in:
邱剑
2019-01-03 17:09:50 +08:00
parent 13a26a2316 ea1bbc2444
commit 8ba1929e51
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/capabilities.go
+4
View File
@@ -52,6 +52,8 @@ func getHypervisors(zone *SZone) []string {
q = q.Equals("zone_id", zone.Id)
}
q = q.IsNotEmpty("host_type").IsNotNull("host_type")
q = q.Equals("host_status", HOST_ONLINE)
q = q.IsTrue("enabled")
q = q.Distinct()
rows, err := q.Rows()
if err != nil {
@@ -75,6 +77,8 @@ func getStorageTypes(zone *SZone) []string {
}
q = q.IsNotEmpty("storage_type").IsNotNull("storage_type")
q = q.IsNotEmpty("medium_type").IsNotNull("medium_type")
q = q.In("status", []string{STORAGE_ENABLED, STORAGE_ONLINE})
q = q.IsTrue("enabled")
q = q.Distinct()
rows, err := q.Rows()
if err != nil {