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

修正：将包年包月资源池的虚拟存储从可用区域的存储列表中排除

Browse Source
This commit is contained in:
Qiu Jian
2019-01-15 12:14:07 +08:00
parent aa6555c647
commit 7bdaac6882
1 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/capabilities.go
+46 -5
View File
@@ -12,6 +12,7 @@ import (
type SCapabilities struct {
Hypervisors []string `json:",allowempty"`
ResourceTypes []string `json:",allowempty"`
StorageTypes []string `json:",allowempty"`
GPUModels []string `json:",allowempty"`
MinNicCount int
@@ -26,6 +27,7 @@ type SCapabilities struct {
func GetCapabilities(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, zone *SZone) (SCapabilities, error) {
capa := SCapabilities{}
capa.Hypervisors = getHypervisors(zone)
capa.ResourceTypes = getResourceTypes(zone)
capa.StorageTypes = getStorageTypes(zone)
capa.GPUModels = getGPUs(zone)
capa.SchedPolicySupport = isSchedPolicySupported(zone)
@@ -71,14 +73,12 @@ func getHypervisors(zone *SZone) []string {
return hypervisors
}
func getStorageTypes(zone *SZone) []string {
q := StorageManager.Query("storage_type", "medium_type")
func getResourceTypes(zone *SZone) []string {
q := HostManager.Query("resource_type")
if zone != nil {
q = q.Equals("zone_id", zone.Id)
}
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.IsNotEmpty("resource_type").IsNotNull("resource_type")
q = q.IsTrue("enabled")
q = q.Distinct()
rows, err := q.Rows()
@@ -86,6 +86,47 @@ func getStorageTypes(zone *SZone) []string {
return nil
}
defer rows.Close()
resourceTypes := make([]string, 0)
for rows.Next() {
var resType string
rows.Scan(&resType)
if len(resType) > 0 {
resourceTypes = append(resourceTypes, resType)
}
}
return resourceTypes
}
func getStorageTypes(zone *SZone) []string {
storages := StorageManager.Query().SubQuery()
hostStorages := HoststorageManager.Query().SubQuery()
hosts := HostManager.Query().SubQuery()
q := storages.Query(storages.Field("storage_type"), storages.Field("medium_type"))
q = q.Join(hostStorages, sqlchemy.Equals(
hostStorages.Field("storage_id"),
storages.Field("id"),
))
q = q.Join(hosts, sqlchemy.Equals(
hosts.Field("id"),
hostStorages.Field("host_id"),
))
if zone != nil {
q = q.Filter(sqlchemy.Equals(storages.Field("zone_id"), zone.Id))
}
q = q.Filter(sqlchemy.Equals(hosts.Field("resource_type"), HostResourceTypeShared))
q = q.Filter(sqlchemy.IsNotEmpty(storages.Field("storage_type")))
q = q.Filter(sqlchemy.IsNotNull(storages.Field("storage_type")))
q = q.Filter(sqlchemy.IsNotEmpty(storages.Field("medium_type")))
q = q.Filter(sqlchemy.IsNotNull(storages.Field("medium_type")))
q = q.Filter(sqlchemy.In(storages.Field("status"), []string{STORAGE_ENABLED, STORAGE_ONLINE}))
q = q.Filter(sqlchemy.IsTrue(storages.Field("enabled")))
q = q.Distinct()
rows, err := q.Rows()
if err != nil {
return nil
}
defer rows.Close()
storageTypes := make([]string, 0)
for rows.Next() {
var storageType, mediumType string