From 1fe54bcf5bb9b9732366a9fa07ee083c0359b712 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Thu, 18 May 2023 15:55:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E4=B8=93=E5=B1=9E?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=A0=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 34598e026ac64b7c455fb3aea0f7414434e95d24 --- .../rpc/internal/logic/listclusterslogic.go | 68 ++++++++++++++++--- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listclusterslogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listclusterslogic.go index 14140f1f..65c9c9e0 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listclusterslogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listclusterslogic.go @@ -6,10 +6,15 @@ package logic */ import ( + "APIGW-go-sdk/core" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common" "PCM/common/tool" "context" + "fmt" + "io/ioutil" "k8s.io/apimachinery/pkg/util/json" + "net/http" + "strconv" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts" @@ -34,17 +39,60 @@ func NewListClustersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List func (l *ListClustersLogic) ListClusters(in *modelarts.ListClustersReq) (*modelarts.ListClustersResp, error) { // todo: add your logic here and delete this line var resp modelarts.ListClustersResp - url := "https://modelarts.cn-north-4.myhuaweicloud.com/v1/" + in.ProjectId + "/clusters" - token := common.GetToken() - statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, url, nil, token) - if err != nil { - return nil, err - } - json.Unmarshal(body, &resp) - if statusCode == 200 { - json.Unmarshal(body, &resp.Resp200) + judgeLimit := strconv.Itoa(int(in.Limit)) + offset := strconv.Itoa(int(in.Offset)) + var limit string + if judgeLimit != "0" { + limit = strconv.Itoa(int(in.Limit)) } else { - json.Unmarshal(body, &resp.Resp400) + limit = "10" + } + //根据智算类型判断走华为智算还是南京智算 + modelArtsType := in.ModelArtsType + if modelArtsType == l.svcCtx.Config.HaweiModelArtsType { + modelArtsUrl := l.svcCtx.Config.ModelArtsUrl + url := modelArtsUrl + "v1/" + in.ProjectId + "/clusters?limit=" + limit + "&offset=" + offset + token := common.GetToken() + statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, url, nil, token) + if err != nil { + return nil, err + } + json.Unmarshal(body, &resp) + if statusCode == 200 { + json.Unmarshal(body, &resp.Resp200) + } else { + json.Unmarshal(body, &resp.Resp400) + } + } else if modelArtsType == l.svcCtx.Config.NanjingModelArtsType { + AK := l.svcCtx.Config.AK + SK := l.svcCtx.Config.SK + NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl + XProjectId := l.svcCtx.Config.XProjectId + s := core.Signer{ + Key: AK, + Secret: SK, + } + r, err := http.NewRequest("GET", NanjingModelArtsUrl+"v1/"+in.ProjectId+"/clusters?offset="+offset+"&"+"limit="+limit, + nil) + if err != nil { + fmt.Println(err) + } + r.Header.Add("content-type", "application/json;charset=UTF-8") + r.Header.Add("X-Project-Id", XProjectId) + r.Header.Add("x-stage", "RELEASE") + s.Sign(r) + client := http.DefaultClient + res, err := client.Do(r) + if err != nil { + fmt.Println(err) + } + defer res.Body.Close() + body, err := ioutil.ReadAll(res.Body) + if err != nil { + fmt.Println(err) + } + json.Unmarshal(body, &resp) + } return &resp, nil }