From 2674a18ad6bba3dade51d67e93cc9ed98c8b8c1d Mon Sep 17 00:00:00 2001 From: tzwang Date: Mon, 25 Sep 2023 17:11:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E7=AE=97=E8=81=94=E5=8A=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 7943b0ac9a9252d7f3f7a3ef713cf7c1be3cb84c --- api/desc/pcm.api | 6 ++++++ api/desc/storelink/pcm-storelink.api | 16 ++++++++++++++++ api/internal/storeLink/octopus.go | 28 +++++++++++++++++++++++----- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/api/desc/pcm.api b/api/desc/pcm.api index efcd9913..e3b877e0 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -314,4 +314,10 @@ service pcm { @handler DeleteLinkTaskHandler delete /storelink/deleteTask (DeleteLinkTaskReq) returns (DeleteLinkTaskResp) + + @handler GetParticipantsHandler + get /storelink/getParticipants (GetParticipantsReq) returns (GetParticipantsResp) + + @handler GetAISpecsHandler + get /storelink/getResourceSpecs (GetResourceSpecsReq) returns (GetResourceSpecsResp) } \ No newline at end of file diff --git a/api/desc/storelink/pcm-storelink.api b/api/desc/storelink/pcm-storelink.api index 1801e74d..41f1eab5 100644 --- a/api/desc/storelink/pcm-storelink.api +++ b/api/desc/storelink/pcm-storelink.api @@ -93,4 +93,20 @@ type ( StartedAt int64 `json:"startedAt"` CompletedAt int64 `json:"completedAt"` } + + GetParticipantsReq { + + } + + GetParticipantsResp { + + } + + GetResourceSpecsReq { + + } + + GetResourceSpecsResp { + + } ) \ No newline at end of file diff --git a/api/internal/storeLink/octopus.go b/api/internal/storeLink/octopus.go index 733b7b25..7cf73b95 100644 --- a/api/internal/storeLink/octopus.go +++ b/api/internal/storeLink/octopus.go @@ -3,6 +3,7 @@ package storeLink import ( "context" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopus" ) @@ -17,6 +18,7 @@ type OctopusLink struct { const ( IMG_NAME_PREFIX = "oct_" IMG_VERSION_PREFIX = "version_" + TASK_NAME_PREFIX = "trainJob_" ) func NewOctopusLink(ctx context.Context, svcCtx *svc.ServiceContext, platform string) *OctopusLink { @@ -27,9 +29,9 @@ func (o *OctopusLink) UploadImage(path string) (interface{}, error) { createReq := &octopus.CreateImageReq{ Platform: o.platform, CreateImage: &octopus.CreateImage{ - SourceType: 1, - //ImageName: IMG_NAME_PREFIX + utils.RandomString(5), - //ImageVersion: IMG_VERSION_PREFIX + utils.RandomString(7), + SourceType: 1, + ImageName: IMG_NAME_PREFIX + utils.RandomString(5), + ImageVersion: IMG_VERSION_PREFIX + utils.RandomString(7), }, } createResp, err := o.svcCtx.OctopusRpc.CreateImage(o.ctx, createReq) @@ -39,7 +41,10 @@ func (o *OctopusLink) UploadImage(path string) (interface{}, error) { uploadReq := &octopus.UploadImageReq{ Platform: o.platform, ImageId: createResp.Payload.ImageId, - Params: &octopus.UploadImageParam{}, + Params: &octopus.UploadImageParam{ + Domain: "", + FileName: "", + }, } uploadResp, err := o.svcCtx.OctopusRpc.UploadImage(o.ctx, uploadReq) if err != nil { @@ -94,7 +99,20 @@ func (o *OctopusLink) QueryImageList() (interface{}, error) { func (o *OctopusLink) SubmitTask(imageId string, cmd string, envs []string) (interface{}, error) { req := &octopus.CreateTrainJobReq{ Platform: o.platform, - Params: &octopus.CreateTrainJobParam{}, + Params: &octopus.CreateTrainJobParam{ + ImageId: imageId, + Name: TASK_NAME_PREFIX + utils.RandomString(5), + ResourcePool: "common-pool", + Config: []*octopus.Config{ + { + Command: cmd, + ResourceSpecId: "6388d3c27f654fa5b11439a3d6098dbc", + MinFailedTaskCount: 1, + MinSucceededTaskCount: 1, + TaskNumber: 1, + }, + }, + }, } resp, err := o.svcCtx.OctopusRpc.CreateTrainJob(o.ctx, req) if err != nil {