Merge pull request 'updated schedule apis' (#148) from tzwang/pcm-coordinator:master into master

Former-commit-id: 33c256400e9fe429118828ad65d4b561dc948bb9

api/desc/pcm.api

@@ -972,6 +972,9 @@ service pcm {
 
 	@handler UploadAlgothmCodeHandler
 	post /schedule/getDownloadAlgothmCode (UploadAlgorithmCodeReq) returns (UploadAlgorithmCodeResp)
+
+	@handler GetComputeCardsByClusterHandler
+	get /schedule/getComputeCardsByCluster/:adapterId/:clusterId (GetComputeCardsByClusterReq) returns (GetComputeCardsByClusterResp)
 }
 
 @server(

api/desc/schedule/pcm-schedule.api

@@ -129,4 +129,13 @@ type (
 
     UploadAlgorithmCodeResp {
     }
+
+    GetComputeCardsByClusterReq {
+        AdapterId string `path:"adapterId"`
+        ClusterId string `path:"clusterId"`
+    }
+
+    GetComputeCardsByClusterResp {
+        Cards []string `json:"cards"`
+    }
 )

api/internal/handler/routes.go

@@ -1215,6 +1215,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/schedule/getDownloadAlgothmCode",
 				Handler: schedule.UploadAlgothmCodeHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/schedule/getComputeCardsByCluster/:adapterId/:clusterId",
+				Handler: schedule.GetComputeCardsByClusterHandler(serverCtx),
+			},
 		},
 		rest.WithPrefix("/pcm/v1"),
 	)

api/internal/handler/schedule/downloadalgothmcodehandler.go

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

api/internal/handler/schedule/getcomputecardsbyclusterhandler.go

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

api/internal/handler/schedule/uploadalgothmcodehandler.go

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

api/internal/logic/ai/getcentertasklistlogic.go

@@ -77,7 +77,7 @@ func (l *GetCenterTaskListLogic) GetCenterTaskList() (resp *types.CenterTaskList
 	select {
 	case _ = <-ch:
 		return resp, nil
-	case <-time.After(1 * time.Second):
+	case <-time.After(2 * time.Second):
 		return resp, nil
 	}
 

api/internal/types/types.go

@@ -5705,6 +5705,15 @@ type UploadAlgorithmCodeReq struct {
 type UploadAlgorithmCodeResp struct {
 }
 
+type GetComputeCardsByClusterReq struct {
+	AdapterId string `path:"adapterId"`
+	ClusterId string `path:"clusterId"`
+}
+
+type GetComputeCardsByClusterResp struct {
+	Cards []string `json:"cards"`
+}
+
 type CreateAlertRuleReq struct {
 	CLusterId   string `json:"clusterId"`
 	ClusterName string `json:"clusterName"`