lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-31 04:50:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: storage-list 返回关联的host信息

Browse Source
This commit is contained in:
Qu Xuan
2020-04-09 16:23:01 +08:00
parent de4ef97fd6
commit de48dfd6c1
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/apis/compute/storage.go
View File

@@ -122,6 +122,11 @@ type SStorageCapacityInfo struct {
FreeCapacity int64 `json:"free_capacity"`
}
type StorageHost struct {
Id string
Name string
}
type StorageDetails struct {
apis.EnabledStatusInfrasResourceBaseDetails
ManagedResourceInfo
@@ -131,6 +136,8 @@ type StorageDetails struct {
SStorage
Hosts []StorageHost `json:"hosts"`
Schedtags []SchedtagShortDescDetails `json:"schedtags"`
// 超分比

39
pkg/compute/models/storages.go
View File

@@ -83,7 +83,7 @@ type SStorage struct {
// 超售比
Cmtbound float32 `nullable:"true" default:"1" list:"admin" update:"admin"`
// 存储配置信息
StorageConf jsonutils.JSONObject `nullable:"true" get:"admin" update:"admin"`
StorageConf jsonutils.JSONObject `nullable:"true" get:"admin" list:"admin" update:"admin"`
// 存储缓存Id
StoragecacheId string `width:"36" charset:"ascii" nullable:"true" list:"admin" get:"admin" update:"admin" create:"optional"`
@@ -441,13 +441,48 @@ func (manager *SStorageManager) FetchCustomizeColumns(
stdRows := manager.SEnabledStatusInfrasResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
zoneRows := manager.SZoneResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
manageRows := manager.SManagedResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
storageIds := make([]string, len(objs))
for i := range rows {
rows[i] = api.StorageDetails{
EnabledStatusInfrasResourceBaseDetails: stdRows[i],
ZoneResourceInfo: zoneRows[i],
ManagedResourceInfo: manageRows[i],
}
rows[i] = objs[i].(*SStorage).getMoreDetails(ctx, rows[i])
storage := objs[i].(*SStorage)
storageIds[i] = storage.Id
rows[i] = storage.getMoreDetails(ctx, rows[i])
}
q := HoststorageManager.Query("storage_id", "host_id").In("storage_id", storageIds)
hoststorages, err := q.Rows()
if err != nil {
return rows
}
defer hoststorages.Close()
hostIds := []string{}
storageMap := make(map[string][]string, len(objs))
for hoststorages.Next() {
var storageId, hostId string
hoststorages.Scan(&storageId, &hostId)
if _, ok := storageMap[storageId]; !ok {
storageMap[storageId] = []string{}
}
storageMap[storageId] = append(storageMap[storageId], hostId)
hostIds = append(hostIds, hostId)
}
hostMap, err := db.FetchIdNameMap2(HostManager, hostIds)
if err != nil {
return rows
}
for i := range rows {
hostIds, ok := storageMap[storageIds[i]]
if ok {
rows[i].Hosts = []api.StorageHost{}
for _, hostId := range hostIds {
if name, ok := hostMap[hostId]; ok {
rows[i].Hosts = append(rows[i].Hosts, api.StorageHost{Id: hostId, Name: name})
}
}
}
}
return rows
}