floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'center resources' (#42) from zhangweiii/pcm-coordinator:master into master 

Former-commit-id: c1e77049b6b1ece691894012ce204ad22e1526e4
This commit is contained in:
zhangweiii 2024-03-11 16:55:23 +08:00
parent fabd4b4125 074c9175cb
commit a0616c749a
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/desc/core/pcm-core.api
View File

@ -163,6 +163,7 @@ type (
cpu float32 `json:"cpu"` cpu float32 `json:"cpu"`
memory float32 `json:"memory"` memory float32 `json:"memory"`
storage float32 `json:"storage"` storage float32 `json:"storage"`
centerType string `json:"centerType"`
} }
) )
type ( type (
@ -726,8 +727,8 @@ type (
) )
type ClusterReq { type ClusterReq {
Id string `json:"id,optional"` Id string `form:"id,optional"`
AdapterId string `json:"adapterId,optional"` AdapterId string `form:"adapterId,optional"`
Name string `json:"name,optional"` Name string `json:"name,optional"`
Nickname string `json:"nickname,optional"` Nickname string `json:"nickname,optional"`
Description string `json:"description,optional"` Description string `json:"description,optional"`

4
api/internal/logic/adapters/clusterlistlogic.go
View File

@ -26,7 +26,11 @@ func NewClusterListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Clust
func (l *ClusterListLogic) ClusterList(req *types.ClusterReq) (resp *types.ClusterListResp, err error) { func (l *ClusterListLogic) ClusterList(req *types.ClusterReq) (resp *types.ClusterListResp, err error) {
resp = &types.ClusterListResp{} resp = &types.ClusterListResp{}
sql := fmt.Sprintf(`select c.* from t_cluster c left join t_adapter a on c.adapter_id = a.id where c.deleted_at is null`) sql := fmt.Sprintf(`select c.* from t_cluster c left join t_adapter a on c.adapter_id = a.id where c.deleted_at is null`)
if req.AdapterId != "" {
sql = fmt.Sprintf(`select * from t_cluster where adapter_id = %s and deleted_at is null `, req.AdapterId)
}
if req.Type != "" { if req.Type != "" {
sql = fmt.Sprintf(`select c.* from t_cluster c left join t_adapter a on c.adapter_id = a.id where c.deleted_at is null and a.type = %s`, req.Type) sql = fmt.Sprintf(`select c.* from t_cluster c left join t_adapter a on c.adapter_id = a.id where c.deleted_at is null and a.type = %s`, req.Type)
} }

3
api/internal/logic/core/centerresourceslogic.go
View File

@ -30,18 +30,21 @@ func (l *CenterResourcesLogic) CenterResources() (resp *types.CenterResourcesRes
Cpu: float32(12.33), Cpu: float32(12.33),
Memory: float32(64.55), Memory: float32(64.55),
Storage: float32(33.90), Storage: float32(33.90),
CenterType: "cloud",
} }
centerIndex2 := types.CenterIndex{ centerIndex2 := types.CenterIndex{
Name: "A超算中心", Name: "A超算中心",
Cpu: float32(42.36), Cpu: float32(42.36),
Memory: float32(66.55), Memory: float32(66.55),
Storage: float32(23.231), Storage: float32(23.231),
CenterType: "hpc",
} }
centerIndex3 := types.CenterIndex{ centerIndex3 := types.CenterIndex{
Name: "智算中心", Name: "智算中心",
Cpu: float32(78.33), Cpu: float32(78.33),
Memory: float32(36.55), Memory: float32(36.55),
Storage: float32(88.93), Storage: float32(88.93),
CenterType: "ai",
} }
resp = &types.CenterResourcesResp{} resp = &types.CenterResourcesResp{}
resp.CentersIndex = append(resp.CentersIndex, centerIndex1) resp.CentersIndex = append(resp.CentersIndex, centerIndex1)

5
api/internal/types/types.go
View File

@ -147,6 +147,7 @@ type CenterIndex struct {
Cpu float32 `json:"cpu"` Cpu float32 `json:"cpu"`
Memory float32 `json:"memory"` Memory float32 `json:"memory"`
Storage float32 `json:"storage"` Storage float32 `json:"storage"`
CenterType string `json:"centerType"`
} }
type GetClusterListReq struct { type GetClusterListReq struct {
@ -694,8 +695,8 @@ type AdapterRelation struct {
} }
type ClusterReq struct { type ClusterReq struct {
Id string `json:"id,optional"` Id string `form:"id,optional"`
AdapterId string `json:"adapterId,optional"` AdapterId string `form:"adapterId,optional"`
Name string `json:"name,optional"` Name string `json:"name,optional"`
Nickname string `json:"nickname,optional"` Nickname string `json:"nickname,optional"`
Description string `json:"description,optional"` Description string `json:"description,optional"`