Merge pull request 'push resource info' (#111) from zhouqunjie/pcm-coordinator:master into master

Former-commit-id: b065b3210b5bca9183ea50cfc733039fd539b2bd

api/client/types.go

@@ -129,25 +129,25 @@ type VmInfo struct {
 }
 
 type ResourceStats struct {
-	ClusterId    int64
+	ClusterId    int64   `json:"clusterId"`
-	Name         string
+	Name         string  `json:"name"`
-	CpuCoreAvail int64
+	CpuCoreAvail int64   `json:"cpuCoreAvail"`
-	CpuCoreTotal int64
+	CpuCoreTotal int64   `json:"cpuCoreTotal"`
-	MemAvail     float64
+	MemAvail     float64 `json:"memAvail"`
-	MemTotal     float64
+	MemTotal     float64 `json:"memTotal"`
-	DiskAvail    float64
+	DiskAvail    float64 `json:"diskAvail"`
-	DiskTotal    float64
+	DiskTotal    float64 `json:"diskTotal"`
-	GpuAvail     int64
+	GpuAvail     int64   `json:"gpuAvail"`
-	CardsAvail   []*Card
+	CardsAvail   []*Card `json:"cardsAvail"`
-	CpuCoreHours float64
+	CpuCoreHours float64 `json:"cpuCoreHours"`
-	Balance      float64
+	Balance      float64 `json:"balance"`
 }
 
 type Card struct {
-	Platform   string
+	Platform   string  `json:"platform"`
-	Type       string
+	Type       string  `json:"type"`
-	Name       string
+	Name       string  `json:"name"`
-	TOpsAtFp16 float64
+	TOpsAtFp16 float64 `json:"TOpsAtFp16"`
-	CardHours  float64
+	CardHours  float64 `json:"cardHours"`
-	CardNum    int32
+	CardNum    int32   `json:"cardNum"`
 }

api/desc/participant/pcm-participant.api

@@ -12,14 +12,14 @@ type PullTaskInfoReq {
     AdapterId int64 `form:"adapterId"`
 }
 
-type PullTaskInfoResp struct {
+type PullTaskInfoResp {
     HpcInfoList []*HpcInfo `json:"HpcInfoList,omitempty"`
     CloudInfoList []*CloudInfo `json:"CloudInfoList,omitempty"`
     AiInfoList []*AiInfo `json:"AiInfoList,omitempty"`
     VmInfoList []*VmInfo `json:"VmInfoList,omitempty"`
 }
 
-type HpcInfo struct {
+type HpcInfo {
     Id          int64        `json:"id"`           // id
     TaskId      int64        `json:"task_id"`      // 任务id
     JobId       string       `json:"job_id"`       // 作业id(在第三方系统中的作业id)
@@ -62,7 +62,7 @@ type HpcInfo struct {
     UpdatedTime string    `json:"updated_time"` // 更新时间
 }
 
-type CloudInfo struct {
+type CloudInfo {
     Participant int64  `json:"participant,omitempty"`
     Id          int64  `json:"id,omitempty"`
     TaskId      int64  `json:"taskId,omitempty"`
@@ -77,7 +77,7 @@ type CloudInfo struct {
     YamlString  string `json:"yamlString,omitempty"`
 }
 
-type AiInfo struct {
+type AiInfo {
     ParticipantId  int64  `json:"participantId,omitempty"`
     TaskId         int64  `json:"taskId,omitempty"`
     ProjectId      string `json:"project_id,omitempty"`
@@ -95,7 +95,7 @@ type AiInfo struct {
     ItemVersionId  string `json:"itemVersionId,omitempty"`
 }
 
-type VmInfo struct {
+type VmInfo {
     ParticipantId       int64  `json:"participantId,omitempty"`
     TaskId              int64  `json:"taskId,omitempty"`
     Name                string `json:"name,omitempty"`
@@ -111,7 +111,7 @@ type VmInfo struct {
     Uuid                string `json:"uuid,omitempty"`
 }
 
-type PushTaskInfoReq struct {
+type PushTaskInfoReq {
     AdapterId     int64 `json:"adapterId"`
     HpcInfoList   []*HpcInfo `json:"hpcInfoList"`
     CloudInfoList []*CloudInfo `json:"cloudInfoList"`
@@ -119,11 +119,41 @@ type PushTaskInfoReq struct {
     VmInfoList    []*VmInfo `json:"vmInfoList"`
 }
 
-type PushTaskInfoResp struct {
+type PushTaskInfoResp {
     Code int64 `json:"code"`
     Msg string `json:"msg"`
 }
 
-type PushResourceInfoReq struct {
+type PushResourceInfoReq {
     AdapterId int64 `json:"adapterId"`
+    ResourceStats []ResourceStats `json:"resourceStats"`
+}
+
+type PushResourceInfoResp {
+    Code int64 `json:"code"`
+    Msg string `json:"msg"`
+}
+
+type ResourceStats {
+    ClusterId    int64   `json:"clusterId"`
+    Name         string  `json:"name"`
+    CpuCoreAvail int64   `json:"cpuCoreAvail"`
+    CpuCoreTotal int64   `json:"cpuCoreTotal"`
+    MemAvail     float64 `json:"memAvail"`
+    MemTotal     float64 `json:"memTotal"`
+    DiskAvail    float64 `json:"diskAvail"`
+    DiskTotal    float64 `json:"diskTotal"`
+    GpuAvail     int64   `json:"gpuAvail"`
+    CardsAvail   []*Card `json:"cardsAvail"`
+    CpuCoreHours float64 `json:"cpuCoreHours"`
+    Balance      float64 `json:"balance"`
+}
+
+type Card {
+    Platform   string  `json:"platform"`
+    Type       string  `json:"type"`
+    Name       string  `json:"name"`
+    TOpsAtFp16 float64 `json:"TOpsAtFp16"`
+    CardHours  float64 `json:"cardHours"`
+    CardNum    int32   `json:"cardNum"`
 }

api/desc/pcm.api

@@ -119,6 +119,10 @@ service pcm {
 	@handler pushTaskInfoHandler
 	post /core/pushTaskInfo (PushTaskInfoReq) returns (PushTaskInfoResp)
 
+	@doc "provided to participant to push resource info to core"
+	@handler pushResourceInfoHandler
+	post /core/pushResourceInfo (PushResourceInfoReq) returns (PushResourceInfoResp)
+
 	@doc "paging queries the task list"
 	@handler pageListTaskHandler
 	get /core/task/list (pageTaskReq) returns(PageResult)

api/internal/handler/core/pushresourceinfohandler.go

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

api/internal/handler/routes.go

@@ -140,6 +140,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/core/pushTaskInfo",
 				Handler: core.PushTaskInfoHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/core/pushResourceInfo",
+				Handler: core.PushResourceInfoHandler(serverCtx),
+			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/core/task/list",

api/internal/logic/core/pushresourceinfologic.go

@@ -0,0 +1,28 @@
+package core
+
+import (
+	"context"
+	clientCore "gitlink.org.cn/JointCloud/pcm-coordinator/api/client"
+
+	"github.com/zeromicro/go-zero/core/logx"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc"
+)
+
+type PushResourceInfoLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewPushResourceInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PushResourceInfoLogic {
+	return &PushResourceInfoLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *PushResourceInfoLogic) PushResourceInfo(req *clientCore.PushResourceInfoReq) (resp *clientCore.PushResourceInfoResp, err error) {
+
+	return
+}

api/internal/types/types.go

@@ -5317,126 +5317,6 @@ type AiAlgorithmsResp struct {
 	Algorithms []string `json:"algorithms"`
 }
 
-type PullTaskInfoReq struct {
-	AdapterId int64 `form:"adapterId"`
-}
-
-type PullTaskInfoResp struct {
-	HpcInfoList   []*HpcInfo   `json:"HpcInfoList,omitempty"`
-	CloudInfoList []*CloudInfo `json:"CloudInfoList,omitempty"`
-	AiInfoList    []*AiInfo    `json:"AiInfoList,omitempty"`
-	VmInfoList    []*VmInfo    `json:"VmInfoList,omitempty"`
-}
-
-type HpcInfo struct {
-	Id          int64  `json:"id"`           // id
-	TaskId      int64  `json:"task_id"`      // 任务id
-	JobId       string `json:"job_id"`       // 作业id(在第三方系统中的作业id)
-	AdapterId   int64  `json:"adapter_id"`   // 执行任务的适配器id
-	ClusterId   int64  `json:"cluster_id"`   // 执行任务的集群id
-	ClusterType string `json:"cluster_type"` // 执行任务的集群类型
-	Name        string `json:"name"`         // 名称
-	Status      string `json:"status"`       // 状态
-	CmdScript   string `json:"cmd_script"`
-	StartTime   string `json:"start_time"`   // 开始时间
-	RunningTime int64  `json:"running_time"` // 运行时间
-	DerivedEs   string `json:"derived_es"`
-	Cluster     string `json:"cluster"`
-	BlockId     int64  `json:"block_id"`
-	AllocNodes  int64  `json:"alloc_nodes"`
-	AllocCpu    int64  `json:"alloc_cpu"`
-	CardCount   int64  `json:"card_count"` // 卡数
-	Version     string `json:"version"`
-	Account     string `json:"account"`
-	WorkDir     string `json:"work_dir"` // 工作路径
-	AssocId     int64  `json:"assoc_id"`
-	ExitCode    int64  `json:"exit_code"`
-	WallTime    string `json:"wall_time"`  // 最大运行时间
-	Result      string `json:"result"`     // 运行结果
-	DeletedAt   string `json:"deleted_at"` // 删除时间
-	YamlString  string `json:"yaml_string"`
-	AppType     string `json:"app_type"`     // 	应用类型
-	AppName     string `json:"app_name"`     // 	应用名称
-	Queue       string `json:"queue"`        // 队列名称
-	SubmitType  string `json:"submit_type"`  // cmd（命令行模式）
-	NNode       string `json:"n_node"`       // 节点个数（当指定该参数时，GAP_NODE_STRING必须为""）
-	StdOutFile  string `json:"std_out_file"` // 工作路径/std.err.%j
-	StdErrFile  string `json:"std_err_file"` // 工作路径/std.err.%j
-	StdInput    string `json:"std_input"`
-	Environment string `json:"environment"`
-	DeletedFlag int64  `json:"deleted_flag"` // 是否删除（0-否，1-是）
-	CreatedBy   int64  `json:"created_by"`   // 创建人
-	CreatedTime string `json:"created_time"` // 创建时间
-	UpdatedBy   int64  `json:"updated_by"`   // 更新人
-	UpdatedTime string `json:"updated_time"` // 更新时间
-}
-
-type CloudInfo struct {
-	Participant int64  `json:"participant,omitempty"`
-	Id          int64  `json:"id,omitempty"`
-	TaskId      int64  `json:"taskId,omitempty"`
-	ApiVersion  string `json:"apiVersion,omitempty"`
-	Kind        string `json:"kind,omitempty"`
-	Namespace   string `json:"namespace,omitempty"`
-	Name        string `json:"name,omitempty"`
-	Status      string `json:"status,omitempty"`
-	StartTime   string `json:"startTime,omitempty"`
-	RunningTime int64  `json:"runningTime,omitempty"`
-	Result      string `json:"result,omitempty"`
-	YamlString  string `json:"yamlString,omitempty"`
-}
-
-type AiInfo struct {
-	ParticipantId  int64  `json:"participantId,omitempty"`
-	TaskId         int64  `json:"taskId,omitempty"`
-	ProjectId      string `json:"project_id,omitempty"`
-	Name           string `json:"name,omitempty"`
-	Status         string `json:"status,omitempty"`
-	StartTime      string `json:"startTime,omitempty"`
-	RunningTime    int64  `json:"runningTime,omitempty"`
-	Result         string `json:"result,omitempty"`
-	JobId          string `json:"jobId,omitempty"`
-	CreateTime     string `json:"createTime,omitempty"`
-	ImageUrl       string `json:"imageUrl,omitempty"`
-	Command        string `json:"command,omitempty"`
-	FlavorId       string `json:"flavorId,omitempty"`
-	SubscriptionId string `json:"subscriptionId,omitempty"`
-	ItemVersionId  string `json:"itemVersionId,omitempty"`
-}
-
-type VmInfo struct {
-	ParticipantId       int64  `json:"participantId,omitempty"`
-	TaskId              int64  `json:"taskId,omitempty"`
-	Name                string `json:"name,omitempty"`
-	FlavorRef           string `json:"flavor_ref,omitempty"`
-	ImageRef            string `json:"image_ref,omitempty"`
-	NetworkUuid         string `json:"network_uuid,omitempty"`
-	BlockUuid           string `json:"block_uuid,omitempty"`
-	SourceType          string `json:"source_type,omitempty"`
-	DeleteOnTermination bool   `json:"delete_on_termination,omitempty"`
-	Status              string `json:"status,omitempty"`
-	MinCount            string `json:"min_count,omitempty"`
-	Platform            string `json:"platform,omitempty"`
-	Uuid                string `json:"uuid,omitempty"`
-}
-
-type PushTaskInfoReq struct {
-	AdapterId     int64        `json:"adapterId"`
-	HpcInfoList   []*HpcInfo   `json:"hpcInfoList"`
-	CloudInfoList []*CloudInfo `json:"cloudInfoList"`
-	AiInfoList    []*AiInfo    `json:"aiInfoList"`
-	VmInfoList    []*VmInfo    `json:"vmInfoList"`
-}
-
-type PushTaskInfoResp struct {
-	Code int64  `json:"code"`
-	Msg  string `json:"msg"`
-}
-
-type PushResourceInfoReq struct {
-	AdapterId int64 `json:"adapterId"`
-}
-
 type CreateAlertRuleReq struct {
 	CLusterId   int64  `json:"clusterId"`
 	ClusterName string `json:"clusterName"`