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

Center Resources top3 

Former-commit-id: a0a1dc23afef71e8a659c4c37467b49e22ab1f31
This commit is contained in:
zhangweiii 2024-02-02 16:33:45 +08:00
parent 41c93839f9 1bc9dbdd3b
commit 0435a6c5aa
12 changed files with 238 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/desc/cloud/pcm-cloud.api
View File

@ -8,6 +8,7 @@ info(
)
/******************find datasetList start*************************/
type ControllerMetricsReq {
Metrics []string `form:"metrics"`
ParticipantId int64 `form:"participantId"`

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

@ -154,6 +154,32 @@ type (
SoftStackSum int64 `json:"softStackSum"`
}
)
type (
centerResourcesResp {
CentersIndex []CenterIndex `json:"centersIndex"`
}
CenterIndex{
name string `json:"name"`
cpu float32 `json:"cpu"`
memory float32 `json:"memory"`
storage float32 `json:"storage"`
}
)
type (
getClusterListReq {
Id int64 `form:"id"`
}
getClusterListResp {
clusters []ClusterInfo `json:"clusters"`
}
ClusterInfo {
Id int64 `json:"id"`
Name string `json:"name"`
Address string `json:"address"`
Token string `json:"token"`
MetricsUrl string `json:"metricsUrl"`
}
)
type (
listRegionResp {
@ -174,7 +200,7 @@ type deleteTaskReq {
Id int64 `path:"id"`
}
type commitTaskReq{
type commitTaskReq {
Name string `json:"name"`
NsID string `json:"nsID"`
Replicas int64 `json:"replicas,optional"`
@ -237,27 +263,27 @@ type (
platform string `json:"platform,optional"`
}
ServerCommit {
allCardRunTime string `json:"allCardRunTime"`
flavorRef string `json:"flavorRef,optional"`
name string `json:"name,optional"`
imageRef string `json:"imageRef,optional"`
accessIPv4 string `json:"accessIPv4,optional"`
accessIPv6 string `json:"accessIPv6,optional"`
adminPass string `json:"adminPass,optional"`
availability_zone string `json:"availability_zone,optional"`
key_name string `json:"key_name,optional"`
hostname string `json:"hostname,optional"`
host string `json:"host,optional"`
networks []Networks `json:"networks,optional"`
allCardRunTime string `json:"allCardRunTime"`
flavorRef string `json:"flavorRef,optional"`
name string `json:"name,optional"`
imageRef string `json:"imageRef,optional"`
accessIPv4 string `json:"accessIPv4,optional"`
accessIPv6 string `json:"accessIPv6,optional"`
adminPass string `json:"adminPass,optional"`
availability_zone string `json:"availability_zone,optional"`
key_name string `json:"key_name,optional"`
hostname string `json:"hostname,optional"`
host string `json:"host,optional"`
networks []Networks `json:"networks,optional"`
}
Networks {
uuid string `json:"uuid,optional"`
port string `json:"port,optional"`
fixed_ip string `json:"fixed_ip,optional"`
tag string `json:"tag,optional"`
uuid string `json:"uuid,optional"`
port string `json:"port,optional"`
fixed_ip string `json:"fixed_ip,optional"`
tag string `json:"tag,optional"`
}
Block_device_mapping_v2Commit {
uuid string `json:"uuid,optional"`
uuid string `json:"uuid,optional"`
}
commitVmTaskResp {

9
api/desc/pcm.api
View File

@ -115,6 +115,10 @@ service pcm {
@doc "获取hashcat"
@handler getHashcatHandler
get /core/getHashcat/:crackTaskId (getHashcatHandlerReq) returns (getHashcatHandlerResp)
@doc "Center Resources top3"
@handler centerResourcesHandler
get /core/centerResources returns (centerResourcesResp)
}
//hpc二级接口
@ -169,6 +173,11 @@ service pcm {
@doc "租户更新"
@handler updateTenantHandler
post /cloud/updateTenant (UpdateTenantReq) returns (CloudResp)
@doc "Obtain cluster list information according to adapterId"
@handler getClusterListHandler
get /core/clusterList (getClusterListReq) returns (getClusterListResp)
}
//智算二级接口

2
api/internal/config/config.go
View File

@ -16,7 +16,6 @@ package config
import (
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/redis"
"github.com/zeromicro/go-zero/rest"
"github.com/zeromicro/go-zero/zrpc"
@ -28,7 +27,6 @@ type Config struct {
DataSource string
}
Redis redis.RedisConf
Cache cache.CacheConf
LogConf logx.LogConf
K8sNativeConf zrpc.RpcClientConf
ACRpcConf zrpc.RpcClientConf

28
api/internal/handler/cloud/getclusterlisthandler.go Normal file
View File

@ -0,0 +1,28 @@
package cloud
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/cloud"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
)
func GetClusterListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.GetClusterListReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
return
}
l := cloud.NewGetClusterListLogic(r.Context(), svcCtx)
resp, err := l.GetClusterList(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
}
}

17
api/internal/handler/core/centerresourceshandler.go Normal file
View File

@ -0,0 +1,17 @@
package core
import (
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
"net/http"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
)
func CenterResourcesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
l := core.NewCenterResourcesLogic(r.Context(), svcCtx)
resp, err := l.CenterResources()
result.HttpResult(r, w, resp, err)
}
}

10
api/internal/handler/routes.go
View File

@ -137,6 +137,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/core/getHashcat/:crackTaskId",
Handler: core.GetHashcatHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/core/centerResources",
Handler: core.CenterResourcesHandler(serverCtx),
},
},
rest.WithPrefix("/pcm/v1"),
)
@ -199,6 +204,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/cloud/updateTenant",
Handler: cloud.UpdateTenantHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/core/clusterList",
Handler: cloud.GetClusterListHandler(serverCtx),
},
},
rest.WithPrefix("/pcm/v1"),
)

30
api/internal/logic/cloud/getclusterlistlogic.go Normal file
View File

@ -0,0 +1,30 @@
package cloud
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
"github.com/zeromicro/go-zero/core/logx"
)
type GetClusterListLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewGetClusterListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetClusterListLogic {
return &GetClusterListLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *GetClusterListLogic) GetClusterList(req *types.GetClusterListReq) (resp *types.GetClusterListResp, err error) {
resp = &types.GetClusterListResp{}
//clusters := []models.ScParticipantPhyInfo{}
l.svcCtx.DbEngin.Find(resp.Clusters).Where("id", req.Id)
return resp, nil
}

39
api/internal/logic/cloud/registerclusterlogic.go
View File

@ -2,13 +2,11 @@ package cloud
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"strconv"
"time"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
"github.com/zeromicro/go-zero/core/logx"
)
@ -39,31 +37,30 @@ func (l *RegisterClusterLogic) RegisterCluster(req *types.RegisterClusterReq) (*
return &resp, nil
}
participant := models.ScParticipantPhyInfo{}
participant.Token = req.Token
participant.Name = req.Name
participant.Address = req.Address
participant.Type = "CLOUD"
participant.Id = utils.GenSnowflakeID()
participant.MetricsUrl = req.MetricsUrl
participant.CreatedTime = time.Now()
participant.UpdatedTime = time.Now()
labelInfo := models.ScParticipantLabelInfo{}
labelInfo.Id = utils.GenSnowflakeID()
labelInfo.ParticipantId = participant.Id
labelInfo.CreatedTime = time.Now()
labelInfo.Key = "cloud"
labelInfo.Value = "sealos"
participant := models.ScParticipantPhyInfo{
Token: req.Token,
Name: req.Name,
Address: req.Address,
Type: "CLOUD",
Id: utils.GenSnowflakeID(),
MetricsUrl: req.MetricsUrl,
}
tx := l.svcCtx.DbEngin.Create(&participant)
if tx.Error != nil {
return nil, tx.Error
}
labelInfo := models.ScParticipantLabelInfo{
Id: utils.GenSnowflakeID(),
ParticipantId: participant.Id,
Key: "cloud",
Value: "sealos",
}
tx2 := l.svcCtx.DbEngin.Create(&labelInfo)
if tx2.Error != nil {
return nil, tx.Error
}
resp.Code = string(200)
resp.Msg = "success"
resp.Data = "participantId:" + strconv.FormatInt(participant.Id, 10)

51
api/internal/logic/core/centerresourceslogic.go Normal file
View File

@ -0,0 +1,51 @@
package core
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
"github.com/zeromicro/go-zero/core/logx"
)
type CenterResourcesLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewCenterResourcesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CenterResourcesLogic {
return &CenterResourcesLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *CenterResourcesLogic) CenterResources() (resp *types.CenterResourcesResp, err error) {
// todo: add your logic here and delete this line
centerIndex1 := types.CenterIndex{
Name: "阿里云",
Cpu: float32(12.33),
Memory: float32(64.55),
Storage: float32(33.90),
}
centerIndex2 := types.CenterIndex{
Name: "A超算中心",
Cpu: float32(42.36),
Memory: float32(66.55),
Storage: float32(23.231),
}
centerIndex3 := types.CenterIndex{
Name: "智算中心",
Cpu: float32(78.33),
Memory: float32(36.55),
Storage: float32(88.93),
}
resp = &types.CenterResourcesResp{}
resp.CentersIndex = append(resp.CentersIndex, centerIndex1)
resp.CentersIndex = append(resp.CentersIndex, centerIndex2)
resp.CentersIndex = append(resp.CentersIndex, centerIndex3)
return resp, nil
}

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

@ -138,6 +138,33 @@ type RegionNum struct {
SoftStackSum int64 `json:"softStackSum"`
}
type CenterResourcesResp struct {
CentersIndex []CenterIndex `json:"centersIndex"`
}
type CenterIndex struct {
Name string `json:"name"`
Cpu float32 `json:"cpu"`
Memory float32 `json:"memory"`
Storage float32 `json:"storage"`
}
type GetClusterListReq struct {
Id int64 `form:"id"`
}
type GetClusterListResp struct {
Clusters []ClusterInfo `json:"clusters"`
}
type ClusterInfo struct {
Id int64 `json:"id"`
Name string `json:"name"`
Address string `json:"address"`
Token string `json:"token"`
MetricsUrl string `json:"metricsUrl"`
}
type ListRegionResp struct {
Code int32 `json:"code"`
Msg string `json:"msg"`

4
go.mod
View File

@ -1,6 +1,8 @@
module gitlink.org.cn/jcce-pcm/pcm-coordinator
go 1.20
go 1.21
toolchain go1.21.0
require (
github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c