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

Merge pull request #875 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-capabilities-storage to release/2.2.0

Browse Source 
* commit 'ddde787707b944fbba1ccffdd32caf4054c093ce':
  capabilities 可用storage过滤
This commit is contained in:
邱剑
2019-01-03 17:09:49 +08:00
parent fc0f8abb49 ddde787707
commit ea1bbc2444
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/capabilities.go
+7 -3
View File
@@ -11,9 +11,9 @@ import (
)
type SCapabilities struct {
Hypervisors []string `json:",allowempty"`
StorageTypes []string `json:",allowempty"`
GPUModels []string `json:",allowempty"`
Hypervisors []string `json:",allowempty"`
StorageTypes []string `json:",allowempty"`
GPUModels []string `json:",allowempty"`
MinNicCount int
MaxNicCount int
MinDataDiskCount int
@@ -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 {