jcce-pcm
/
pcm-coordinator
8
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码目录调整

This commit is contained in:
zhangwei 2023-09-25 15:00:58 +08:00
parent 5a33aba8bf
commit 8cf8a3238d
173 changed files with 1877 additions and 644 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -9,7 +9,7 @@ PCM
# Test binary, built with `go test -c`
*.test
# Output of the go coverage tool, specifically when used with LiteIDE
# Output of the go coverage utils, specifically when used with LiteIDE
*.out
coverage.txt

9
api/internal/handler/core/scheduletaskbyyamlhandler.go
View File

@ -1,14 +1,13 @@
package core
import (
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core"
"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/utils"
"gitlink.org.cn/jcce-pcm/utils/result"
"net/http"
)
func ScheduleTaskByYamlHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
@ -24,7 +23,7 @@ func ScheduleTaskByYamlHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
result.HttpResult(r, w, nil, err)
return
}
err = tool.Yaml2struct(fileHeader, &req)
err = utils.Yaml2struct(fileHeader, &req)
if err != nil {
result.HttpResult(r, w, nil, err)
return

20
api/internal/handler/image/chunkhandler.go
View File

@ -9,9 +9,9 @@ import (
"github.com/aws/aws-sdk-go/service/s3/s3manager"
types2 "github.com/docker/docker/api/types"
"github.com/zeromicro/go-zero/core/logx"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
result2 "gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/fileutils"
"io/ioutil"
"k8s.io/apimachinery/pkg/util/json"
"net/http"
@ -36,10 +36,10 @@ func ChunkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
dataType := r.PostFormValue("dataType")
kind := r.PostFormValue("kind")
// 对比合并请求的文件大小和已上传文件夹大小
toSize, err := tool.GetDirSize(filepath.Join(uploadTempPath, hash))
toSize, err := fileutils.GetDirSize(filepath.Join(uploadTempPath, hash))
if err != nil {
logx.Error(err)
result2.HttpResult(r, w, nil, err)
result.HttpResult(r, w, nil, err)
return
}
if size != toSize {
@ -54,7 +54,7 @@ func ChunkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
filesSort[nameArr[1]] = f.Name()
}
saveFile := filepath.Join(uploadPath, name)
if exists, _ := tool.PathExists(saveFile); exists {
if exists, _ := fileutils.PathExists(saveFile); exists {
os.Remove(saveFile)
}
fs, _ := os.OpenFile(saveFile, os.O_CREATE|os.O_RDWR|os.O_APPEND, os.ModeAppend|os.ModePerm)
@ -77,7 +77,7 @@ func ChunkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
os.RemoveAll(chunksPath)
// 保存到数据库表里
svcCtx.DbEngin.Create(&model.File{
svcCtx.DbEngin.Create(&models.File{
Name: name,
Hash: hash,
DataType: dataType,
@ -95,7 +95,7 @@ func ChunkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
// 删除本地文件 避免占用本地存储资源
defer os.Remove(filepath.Join(uploadPath, name))
defer fs.Close()
result2.HttpResult(r, w, nil, err)
result.HttpResult(r, w, nil, err)
}
}
@ -121,7 +121,7 @@ func uploadStorage(svcCtx *svc.ServiceContext, hash string, name string) error {
return err
}
// 更新数据状态
svcCtx.DbEngin.Model(&model.File{}).Where("hash = ?", hash).Update("status", "cloud")
svcCtx.DbEngin.Model(&models.File{}).Where("hash = ?", hash).Update("status", "cloud")
return nil
}
@ -189,6 +189,6 @@ func pushImage(svcCtx *svc.ServiceContext, hash string, name string) error {
return err
}
// 更新数据状态
svcCtx.DbEngin.Model(&model.File{}).Where("hash = ?", hash).Update("status", "cloud")
svcCtx.DbEngin.Model(&models.File{}).Where("hash = ?", hash).Update("status", "cloud")
return nil
}

21
api/internal/handler/image/uploadhandler.go
View File

@ -4,16 +4,15 @@ import (
"bufio"
"fmt"
"github.com/zeromicro/go-zero/core/logx"
result2 "gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/fileutils"
"io"
"net/http"
"os"
"path/filepath"
"strconv"
"syscall"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
)
type LoadBody struct {
@ -27,7 +26,7 @@ func UploadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
file, fileHeader, err := r.FormFile("file")
if err != nil {
logx.Error(err)
result2.HttpResult(r, w, nil, err)
result.HttpResult(r, w, nil, err)
return
}
index := r.PostFormValue("index")
@ -39,27 +38,27 @@ func UploadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
// 文件路径
filePath := filepath.Join(chunksPath, hash+"-"+index)
// 检查临时文件夹是否存在 不存在则创建文件夹
isPathExists, err := tool.PathExists(chunksPath)
isPathExists, err := fileutils.PathExists(chunksPath)
if !isPathExists {
err = os.MkdirAll(chunksPath, os.ModePerm)
if err != nil {
logx.Error(err)
result2.HttpResult(r, w, nil, err)
result.HttpResult(r, w, nil, err)
return
}
}
// 检查文件是否存在
exists, err := tool.PathExists(filePath)
exists, err := fileutils.PathExists(filePath)
if err != nil {
logx.Error(err)
result2.HttpResult(r, w, nil, err)
result.HttpResult(r, w, nil, err)
return
}
// 文件存在 进行断点续传
if exists {
fileInfo, _ := os.Stat(filePath)
if fileInfo.Size() == fileHeader.Size {
result2.HttpResult(r, w, nil, err)
result.HttpResult(r, w, nil, err)
return
}
start := strconv.Itoa(int(fileInfo.Size()))
@ -100,6 +99,6 @@ func UploadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
defer file.Close()
defer destFile.Close()
}
result2.HttpResult(r, w, nil, err)
result.HttpResult(r, w, nil, err)
}
}

6
api/internal/logic/ai/createalgorithmlogic.go
View File

@ -6,9 +6,9 @@ import (
"github.com/zeromicro/go-zero/core/logx"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
)
@ -28,7 +28,7 @@ func NewCreateAlgorithmLogic(ctx context.Context, svcCtx *svc.ServiceContext) *C
func (l *CreateAlgorithmLogic) CreateAlgorithm(req *types.CreateAlgorithmReq) (resp *types.CreateAlgorithmResp, err error) {
modelartsReq := &modelarts.CreateAlgorithmReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
ListAlgorithmsResp, err := l.svcCtx.ModelArtsRpc.CreateAlgorithm(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
@ -38,6 +38,6 @@ func (l *CreateAlgorithmLogic) CreateAlgorithm(req *types.CreateAlgorithmReq) (r
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListAlgorithmsResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListAlgorithmsResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
return resp, nil
}

6
api/internal/logic/ai/createdatasetlogic.go
View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
@ -32,14 +32,14 @@ func (l *CreateDataSetLogic) CreateDataSet(req *types.CreateDataSetReq) (resp *t
// todo: add your logic here and delete this line
modelartsReq := &modelarts.CreateDataSetReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
CreateDataSetResp, err := l.svcCtx.ModelArtsRpc.CreateDataSet(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
}
resp = &types.CreateDataSetResp{}
err = copier.CopyWithOption(&resp, &CreateDataSetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateDataSetResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

17
api/internal/logic/ai/createexporttasklogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,16 +32,16 @@ func NewCreateExportTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
func (l *CreateExportTaskLogic) CreateExportTask(req *types.CreateExportTaskReq) (resp *types.ExportTaskDataResp, err error) {
modelartsReq := &modelarts.ExportTaskReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
CreateExportTaskResp, err := l.svcCtx.ModelArtsRpc.ExportTask(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&CreateExportTaskResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateExportTaskResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateExportTaskResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

11
api/internal/logic/ai/createnotebooklogic.go
View File

@ -4,12 +4,11 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"github.com/zeromicro/go-zero/core/logx"
)
@ -30,14 +29,14 @@ func NewCreateNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cr
func (l *CreateNotebookLogic) CreateNotebook(req *types.CreateNotebookReq) (resp *types.CreateNotebookResp, err error) {
modelartsReq := &modelarts.CreateNotebookReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
createNotebookResp, err := l.svcCtx.ModelArtsRpc.CreateNotebook(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to create notebook"), "Failed to create notebook err : %v ,req:%+v", err, req)
}
resp = &types.CreateNotebookResp{}
err = copier.CopyWithOption(resp, createNotebookResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(resp, createNotebookResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
return resp, nil
}

11
api/internal/logic/ai/createprocessortasklogic.go
View File

@ -4,12 +4,11 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"github.com/zeromicro/go-zero/core/logx"
)
@ -30,14 +29,14 @@ func NewCreateProcessorTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext
func (l *CreateProcessorTaskLogic) CreateProcessorTask(req *types.CreateProcessorTaskReq) (resp *types.CreateProcessorTaskResp, err error) {
modelartsReq := &modelarts.CreateProcessorTaskReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
CreateProcessorTaskResp, err := l.svcCtx.ModelArtsRpc.CreateProcessorTask(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
}
resp = &types.CreateProcessorTaskResp{}
err = copier.CopyWithOption(&resp, &CreateProcessorTaskResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateProcessorTaskResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

13
api/internal/logic/ai/createservicelogic.go
View File

@ -3,13 +3,12 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -30,7 +29,7 @@ func NewCreateServiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cre
func (l *CreateServiceLogic) CreateService(req *types.CreateServiceReq) (resp *types.CreateServiceResp, err error) {
modelartsReq := &modelarts.CreateServiceReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
CreateServiceResp, err := l.svcCtx.ModelArtsRpc.CreateService(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
@ -40,6 +39,6 @@ func (l *CreateServiceLogic) CreateService(req *types.CreateServiceReq) (resp *t
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateServiceResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateServiceResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
return resp, nil
}

15
api/internal/logic/ai/createtasklogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -32,7 +31,7 @@ func NewCreateTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Create
func (l *CreateTaskLogic) CreateTask(req *types.ImportTaskDataReq) (resp *types.ImportTaskDataResp, err error) {
modelartsReq := &modelarts.ImportTaskDataReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
ImportTaskDataResp, err := l.svcCtx.ModelArtsRpc.CreateTask(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -42,6 +41,6 @@ func (l *CreateTaskLogic) CreateTask(req *types.ImportTaskDataReq) (resp *types.
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ImportTaskDataResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ImportTaskDataResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
return resp, nil
}

17
api/internal/logic/ai/createtrainingjoblogic.go
View File

@ -3,13 +3,12 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -32,16 +31,16 @@ func (l *CreateTrainingJobLogic) CreateTrainingJob(req *types.CreateTrainingJobR
// todo: add your logic here and delete this line
//modelartsType := req.ModelartsType
modelartsReq := &modelarts.CreateTrainingJobReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
CreateTrainingJobResp, err := l.svcCtx.ModelArtsRpc.CreateTrainingJob(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
marshal, err := json.Marshal(&CreateTrainingJobResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateTrainingJobResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateTrainingJobResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
return resp, nil
}

11
api/internal/logic/ai/deletealgorithmlogic.go
View File

@ -4,16 +4,15 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"strings"
"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,7 +38,7 @@ func (l *DeleteAlgorithmLogic) DeleteAlgorithm(req *types.DeleteAlgorithmReq) (r
}
payload := strings.NewReader(string(reqByte))
println(payload)
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
DeleteAlgorithmResp, err := l.svcCtx.ModelArtsRpc.DeleteAlgorithms(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -49,6 +48,6 @@ func (l *DeleteAlgorithmLogic) DeleteAlgorithm(req *types.DeleteAlgorithmReq) (r
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &DeleteAlgorithmResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &DeleteAlgorithmResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

15
api/internal/logic/ai/deletedatasetlogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewDeleteDataSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Del
func (l *DeleteDataSetLogic) DeleteDataSet(req *types.DeleteDataSetReq) (resp *types.DeleteDataSetResp, err error) {
// todo: add your logic here and delete this line
modelartsReq := &modelarts.DeleteDataSetReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
deleteDataSetResp, err := l.svcCtx.ModelArtsRpc.DeleteDataSet(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *DeleteDataSetLogic) DeleteDataSet(req *types.DeleteDataSetReq) (resp *t
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &deleteDataSetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &deleteDataSetResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

12
api/internal/logic/ai/deleteservicelogic.go
View File

@ -3,9 +3,9 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
@ -30,16 +30,16 @@ func NewDeleteServiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Del
func (l *DeleteServiceLogic) DeleteService(req *types.DeleteServiceReq) (resp *types.DeleteServiceResp, err error) {
modelartsReq := &modelarts.DeleteServiceReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
deleteServiceResp, err := l.svcCtx.ModelArtsRpc.DeleteService(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
marshal, err := json.Marshal(&deleteServiceResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &deleteServiceResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &deleteServiceResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

17
api/internal/logic/ai/deletetrainingjoblogic.go
View File

@ -3,13 +3,12 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -30,16 +29,16 @@ func NewDeleteTrainingJobLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *DeleteTrainingJobLogic) DeleteTrainingJob(req *types.DeleteTrainingJobReq) (resp *types.DeleteTrainingJobResp, err error) {
modelartsReq := &modelarts.DeleteTrainingJobReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
deleteTrainingJobResp, err := l.svcCtx.ModelArtsRpc.DeleteTrainingJob(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
marshal, err := json.Marshal(&deleteTrainingJobResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &deleteTrainingJobResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &deleteTrainingJobResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

15
api/internal/logic/ai/getexporttasksofdatasetlogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -32,7 +31,7 @@ func NewGetExportTasksOfDatasetLogic(ctx context.Context, svcCtx *svc.ServiceCon
func (l *GetExportTasksOfDatasetLogic) GetExportTasksOfDataset(req *types.GetExportTasksOfDatasetReq) (resp *types.GetExportTasksOfDatasetResp, err error) {
modelartsReq := &modelarts.GetExportTasksOfDatasetReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
GetExportTasksOfDatasetResp, err := l.svcCtx.ModelArtsRpc.GetExportTasksOfDataset(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -42,6 +41,6 @@ func (l *GetExportTasksOfDatasetLogic) GetExportTasksOfDataset(req *types.GetExp
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &GetExportTasksOfDatasetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &GetExportTasksOfDatasetResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

6
api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go
View File

@ -3,9 +3,9 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
@ -30,7 +30,7 @@ func NewGetExportTaskStatusOfDatasetLogic(ctx context.Context, svcCtx *svc.Servi
func (l *GetExportTaskStatusOfDatasetLogic) GetExportTaskStatusOfDataset(req *types.GetExportTaskStatusOfDatasetReq) (resp *types.GetExportTaskStatusOfDatasetResp, err error) {
modelartsReq := &modelarts.GetExportTaskStatusOfDatasetReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
GetExportTaskStatusOfDatasetResp, err := l.svcCtx.ModelArtsRpc.GetExportTaskStatusOfDataset(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
@ -40,6 +40,6 @@ func (l *GetExportTaskStatusOfDatasetLogic) GetExportTaskStatusOfDataset(req *ty
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &GetExportTaskStatusOfDatasetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &GetExportTaskStatusOfDatasetResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

18
api/internal/logic/ai/getlisttrainingjobslogic.go
View File

@ -6,9 +6,9 @@ import (
"github.com/pkg/errors"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
@ -31,7 +31,7 @@ func NewGetListTrainingJobsLogic(ctx context.Context, svcCtx *svc.ServiceContext
func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJobsreq) (resp *types.ListTrainingJobsresp, err error) {
modelartsReq := &modelarts.ListTrainingJobsreq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetListTrainingJobs(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -41,13 +41,13 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: utils.Converters})
return resp, nil
/* modelartsType := req.ModelartsType
switch modelartsType {
case "octops":
octopusReq := &octopus.GetTrainJobListReq{}
err = copier.CopyWithOption(octopusReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(octopusReq, req, copier.Option{Converters: utils.Converters})
listTrainJobResp, err := l.svcCtx.OctopusRpc.GetTrainJobList(l.ctx, octopusReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db TrainJobs list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -57,10 +57,10 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &listTrainJobResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &listTrainJobResp, copier.Option{Converters: utils.Converters})
case "cn-north-4.myhuawei":
modelartsReq := &modelarts.ListTrainingJobsreq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetListTrainingJobs(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db TrainJobs list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -70,11 +70,11 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: utils.Converters})
case "cn-east-293.njaci":
modelartsReq := &modelarts.ListTrainingJobsreq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetListTrainingJobs(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db TrainJobs list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -84,7 +84,7 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: utils.Converters})
}*/
}

6
api/internal/logic/ai/listalgorithmslogic.go
View File

@ -3,9 +3,9 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
@ -30,7 +30,7 @@ func NewListAlgorithmsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Li
func (l *ListAlgorithmsLogic) ListAlgorithms(req *types.ListAlgorithmsReq) (resp *types.ListAlgorithmsResp, err error) {
modelartsReq := &modelarts.ListAlgorithmsReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: false, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: false, DeepCopy: true, Converters: utils.Converters})
ListAlgorithmsResp, err := l.svcCtx.ModelArtsRpc.ListAlgorithms(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
@ -40,6 +40,6 @@ func (l *ListAlgorithmsLogic) ListAlgorithms(req *types.ListAlgorithmsReq) (resp
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListAlgorithmsResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListAlgorithmsResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

6
api/internal/logic/ai/listclusterslogic.go
View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
@ -31,12 +31,12 @@ func NewListClustersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List
func (l *ListClustersLogic) ListClusters(req *types.ListClustersReq) (resp *types.ListClustersResp, err error) {
// todo: add your logic here and delete this line
modelartsReq := &modelarts.ListClustersReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
ListClustersResp, err := l.svcCtx.ModelArtsRpc.ListClusters(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
}
resp = &types.ListClustersResp{}
err = copier.CopyWithOption(&resp, &ListClustersResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListClustersResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

12
api/internal/logic/ai/listdatasetlogic.go
View File

@ -4,9 +4,9 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
@ -33,17 +33,17 @@ func NewListDataSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListD
func (l *ListDataSetLogic) ListDataSet(req *types.DataSetReq) (resp *types.DataSetResp, err error) {
// todo: add your logic here and delete this line
modelartsReq := &modelarts.DataSetReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
//err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
//err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
DataSetResp, err := l.svcCtx.ModelArtsRpc.GetDatasetList(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&DataSetResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &DataSetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &DataSetResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

13
api/internal/logic/ai/listimportlogic.go
View File

@ -3,13 +3,12 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -30,13 +29,13 @@ func NewListImportLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListIm
func (l *ListImportLogic) ListImport(req *types.ListImportTasksReq) (resp *types.ListImportTasksResp, err error) {
modelartsReq := &modelarts.ListImportTasksReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetImportTaskList(l.ctx, modelartsReq)
marshal, err := json.Marshal(&listDataSetResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
return resp, nil
}

11
api/internal/logic/ai/listnotebooklogic.go
View File

@ -4,12 +4,11 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"github.com/zeromicro/go-zero/core/logx"
)
@ -30,7 +29,7 @@ func NewListNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List
func (l *ListNotebookLogic) ListNotebook(req *types.ListNotebookReq) (resp *types.ListNotebookResp, err error) {
modelartsReq := &modelarts.ListNotebookReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
listNotebookResp, err := l.svcCtx.ModelArtsRpc.ListNotebook(l.ctx, modelartsReq)
if err != nil {
@ -38,7 +37,7 @@ func (l *ListNotebookLogic) ListNotebook(req *types.ListNotebookReq) (resp *type
}
resp = &types.ListNotebookResp{}
err = copier.CopyWithOption(resp, listNotebookResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(resp, listNotebookResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

13
api/internal/logic/ai/listserviceslogic.go
View File

@ -3,13 +3,12 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -30,7 +29,7 @@ func NewListServicesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List
func (l *ListServicesLogic) ListServices(req *types.ListServicesReq) (resp *types.ListServicesResp, err error) {
modelartsReq := &modelarts.ListServicesReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
ListServicesResp, err := l.svcCtx.ModelArtsRpc.ListServices(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
@ -40,6 +39,6 @@ func (l *ListServicesLogic) ListServices(req *types.ListServicesReq) (resp *type
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListServicesResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListServicesResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
return resp, nil
}

6
api/internal/logic/ai/showalgorithmbyuuidlogic.go
View File

@ -4,9 +4,9 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
@ -33,7 +33,7 @@ func NewShowAlgorithmByUuidLogic(ctx context.Context, svcCtx *svc.ServiceContext
func (l *ShowAlgorithmByUuidLogic) ShowAlgorithmByUuid(req *types.ShowAlgorithmByUuidReq) (resp *types.ShowAlgorithmByUuidResp, err error) {
modelartsReq := &modelarts.ShowAlgorithmByUuidReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
ShowAlgorithmByUuidResp, err := l.svcCtx.ModelArtsRpc.ShowAlgorithmByUuid(l.ctx, modelartsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req)
@ -43,6 +43,6 @@ func (l *ShowAlgorithmByUuidLogic) ShowAlgorithmByUuid(req *types.ShowAlgorithmB
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ShowAlgorithmByUuidResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ShowAlgorithmByUuidResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

6
api/internal/logic/ai/showservicelogic.go
View File

@ -3,9 +3,9 @@ package ai
import (
"context"
"github.com/jinzhu/copier"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
@ -30,7 +30,7 @@ func NewShowServiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ShowS
func (l *ShowServiceLogic) ShowService(req *types.ShowServiceReq) (resp *types.ShowServiceResp, err error) {
modelartsReq := &modelarts.ShowServiceReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters})
ShowServiceResp, err := l.svcCtx.ModelArtsRpc.ShowService(l.ctx, modelartsReq)
if err != nil {
return nil, result.NewDefaultError(err.Error())
@ -40,6 +40,6 @@ func (l *ShowServiceLogic) ShowService(req *types.ShowServiceReq) (resp *types.S
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ShowServiceResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ShowServiceResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters})
return resp, nil
}

12
api/internal/logic/cloud/cloudlistlogic.go
View File

@ -2,13 +2,11 @@ package cloud
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
"gitlink.org.cn/jcce-pcm/utils/tool"
"github.com/zeromicro/go-zero/core/logx"
"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"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
)
type CloudListLogic struct {
@ -27,12 +25,12 @@ func NewCloudListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CloudLi
func (l *CloudListLogic) CloudList() (resp *types.CloudListResp, err error) {
// 查询数据库中数算任务列表
var clouds []*model.Cloud
var clouds []*models.Cloud
tx := l.svcCtx.DbEngin.Find(&clouds)
if tx.Error != nil {
return nil, tx.Error
}
result := types.CloudListResp{}
tool.Convert(clouds, &result.Clouds)
utils.Convert(clouds, &result.Clouds)
return &result, nil
}

6
api/internal/logic/core/deletetasklogic.go
View File

@ -2,7 +2,7 @@ package core
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
models2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
@ -26,12 +26,12 @@ func NewDeleteTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Delete
func (l *DeleteTaskLogic) DeleteTask(req *types.DeleteTaskReq) error {
// 删除主任务信息
tx := l.svcCtx.DbEngin.Delete(&model.Task{}, req.Id)
tx := l.svcCtx.DbEngin.Delete(&models2.Task{}, req.Id)
if tx.Error != nil {
return tx.Error
}
// 将子任务信息修改为待删除
tx = l.svcCtx.DbEngin.Model(&model.Cloud{}).Where("task_id", req.Id).Update("status", "WaitDelete")
tx = l.svcCtx.DbEngin.Model(&models2.Cloud{}).Where("task_id", req.Id).Update("status", "WaitDelete")
if tx.Error != nil {
return tx.Error
}

12
api/internal/logic/core/gethashcatlogic.go
View File

@ -2,13 +2,11 @@ package core
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
"gitlink.org.cn/jcce-pcm/utils/tool"
"github.com/zeromicro/go-zero/core/logx"
"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"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
)
type GetHashcatLogic struct {
@ -27,12 +25,12 @@ func NewGetHashcatLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetHas
func (l *GetHashcatLogic) GetHashcat(req *types.GetHashcatHandlerReq) (resp *types.GetHashcatHandlerResp, err error) {
// todo: add your logic here and delete this line
var hashcatList []*model.THashcat
var hashcatList []*models.THashcat
tx := l.svcCtx.DbEngin.Where("crack_task_id = ?", req.CrackTaskId).Find(&hashcatList)
if tx.Error != nil {
return nil, tx.Error
}
result := types.GetHashcatHandlerResp{}
tool.Convert(hashcatList, &result.HashCatList)
utils.Convert(hashcatList, &result.HashCatList)
return &result, nil
}

4
api/internal/logic/core/getregionlogic.go
View File

@ -2,7 +2,7 @@ package core
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
@ -26,7 +26,7 @@ func NewGetRegionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRegi
func (l *GetRegionLogic) GetRegion() (resp *types.GetRegionResp, err error) {
resp = &types.GetRegionResp{}
var regionSlurmArray []model.RegionSlurm
var regionSlurmArray []models.RegionSlurm
regionNameDb := l.svcCtx.DbEngin.Find(&regionSlurmArray).Not("RegionName = ?", "")
softStackDb := l.svcCtx.DbEngin.Find(&regionSlurmArray).Not("SoftStack = ?", "")
resp = &types.GetRegionResp{

11
api/internal/logic/core/getresourcepanelconfiglogic.go
View File

@ -2,12 +2,11 @@ package core
import (
"context"
"github.com/zeromicro/go-zero/core/logx"
"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/model"
"gitlink.org.cn/jcce-pcm/utils/tool"
"github.com/zeromicro/go-zero/core/logx"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
)
type GetResourcePanelConfigLogic struct {
@ -25,8 +24,8 @@ func NewGetResourcePanelConfigLogic(ctx context.Context, svcCtx *svc.ServiceCont
}
func (l *GetResourcePanelConfigLogic) GetResourcePanelConfig() (resp *types.ResourcePanelConfigResp, err error) {
rpcModel := model.ResourcePanelConfig{}
rpcModel := models.ResourcePanelConfig{}
l.svcCtx.DbEngin.Find(&rpcModel)
tool.Convert(rpcModel, &resp)
utils.Convert(rpcModel, &resp)
return resp, nil
}

13
api/internal/logic/core/jobtotallogic.go
View File

@ -2,14 +2,13 @@ package core
import (
"context"
"github.com/zeromicro/go-zero/core/logx"
"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/model"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/httputils"
"gitlink.org.cn/jcce-pcm/utils/enum"
"gitlink.org.cn/jcce-pcm/utils/tool"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
type JobTotalLogic struct {
@ -44,7 +43,7 @@ func NewJobTotalLogic(ctx context.Context, svcCtx *svc.ServiceContext) *JobTotal
func (l *JobTotalLogic) JobTotal() (resp *types.JobTotalResp, err error) {
// 获取任务时间信息
resp = &types.JobTotalResp{}
bytes, err := tool.HttpGet("GET", "https://grampus.openi.org.cn/openapi/v1/sharescreen/computepower/alljobinfo")
bytes, err := httputils.HttpGet("GET", "https://grampus.openi.org.cn/openapi/v1/sharescreen/computepower/alljobinfo")
if err != nil {
return nil, err
}
@ -52,7 +51,7 @@ func (l *JobTotalLogic) JobTotal() (resp *types.JobTotalResp, err error) {
// 获取其他任务信息
jobs := &Job{}
jobBytes, err := tool.HttpGet("GET", "https://grampus.openi.org.cn/openapi/v1/sharescreen/trainjob?pageIndex=1&pageSize=10")
jobBytes, err := httputils.HttpGet("GET", "https://grampus.openi.org.cn/openapi/v1/sharescreen/trainjob?pageIndex=1&pageSize=10")
if err != nil {
return nil, err
}
@ -71,7 +70,7 @@ func (l *JobTotalLogic) JobTotal() (resp *types.JobTotalResp, err error) {
resp.TrainJobs = append(resp.TrainJobs, trainJob)
}
var tasks []model.Task
var tasks []models.Task
tx := l.svcCtx.DbEngin.Find(&tasks)
if tx.Error != nil {
logx.Error(err)

6
api/internal/logic/core/listcenterlogic.go
View File

@ -5,7 +5,7 @@ import (
"github.com/zeromicro/go-zero/core/logx"
"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/model"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
)
type ListCenterLogic struct {
@ -24,9 +24,9 @@ func NewListCenterLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListCe
func (l *ListCenterLogic) ListCenter() (*types.ListCenterResp, error) {
var centers []types.Center
var centersModel *[]model.CenterOverview
var centersModel *[]models.CenterOverview
//var centersModel []model.ComputeCenter
//var centersModel []models.ComputeCenter
var resp types.ListCenterResp
l.svcCtx.DbEngin.Raw("select cc.*, ac.cluster_num, ac.node_num, ac.cpu_num, ac.gpu_num, ac.managed_flops, ac.unmanaged_flops, ac.managed_storage, ac.unmanaged_storage, hc.cluster_num, c.node_num, hc.cpu_num, hc.gpu_num, hc.managed_flops, hc.unmanaged_flops, hc.managed_storage, hc.unmanaged_storage, c.cluster_num, c.node_num, c.cpu_num, c.gpu_num, c.managed_flops, c.unmanaged_flops, c.managed_storage, c.unmanaged_storage, ct.edwc, ct.ydyl\nfrom compute_center cc\nleft join ai_center ac on cc.id = ac.id\nleft join hpc_center hc on cc.id = hc.id\nleft join cloud_center c on cc.id = c.id\nleft join center_tag ct on cc.id = ct.id").Scan(&centersModel)

6
api/internal/logic/core/listclusterlogic.go
View File

@ -5,7 +5,7 @@ import (
"github.com/zeromicro/go-zero/core/logx"
"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/model"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
)
type ListClusterLogic struct {
@ -25,9 +25,9 @@ func NewListClusterLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListC
func (l *ListClusterLogic) ListCluster(req *types.ListClusterReq) (*types.ListClusterResp, error) {
var clusters []types.ComputeCluster
var clustersModel *[]model.ComputeCluster
var clustersModel *[]models.ComputeCluster
//var centersModel []model.ComputeCenter
//var centersModel []models.ComputeCenter
var resp types.ListClusterResp
l.svcCtx.DbEngin.Raw("select * from compute_cluster where center_id = ?", req.CenterId).Scan(&clustersModel)

11
api/internal/logic/core/listdomainresourcelogic.go
View File

@ -7,8 +7,9 @@ import (
"github.com/zeromicro/go-zero/core/logx"
"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/model"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/httputils"
"k8s.io/apimachinery/pkg/util/json"
"math"
"strconv"
@ -31,15 +32,15 @@ func NewListDomainResourceLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *ListDomainResourceLogic) ListDomainResource() (resp *types.DomainResourceResp, err error) {
//TODO 域信息查询数算集群监控
resp = &types.DomainResourceResp{}
var domainResourceModel []model.DomainResource
var domainResourceModel []models.DomainResource
sqlStr := "select * from `joint_domain`.domain_cluster"
l.svcCtx.DbEngin.Raw(sqlStr).Scan(&domainResourceModel)
tool.Convert(domainResourceModel, &resp.DomainResourceList)
utils.Convert(domainResourceModel, &resp.DomainResourceList)
metrics := &types.ClusterMetrics{}
//获取指定集群监控数据
for i := 0; i < len(resp.DomainResourceList); i++ {
url := fmt.Sprintf("%s/api/v1/resource/getClusterMetrics?clusterName=%s", l.svcCtx.Config.JccScheduleUrl, resp.DomainResourceList[i].ClusterName)
bytes, err := tool.HttpGet("GET", url)
bytes, err := httputils.HttpGet("GET", url)
if err != nil {
logx.WithContext(l.ctx).Errorf("获取云算指定集群监控数据 err: %s", err.Error())
return nil, err

12
api/internal/logic/core/listregionlogic.go
View File

@ -2,13 +2,11 @@ package core
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
"gitlink.org.cn/jcce-pcm/utils/tool"
"github.com/zeromicro/go-zero/core/logx"
"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"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
)
type ListRegionLogic struct {
@ -27,12 +25,12 @@ func NewListRegionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListRe
func (l *ListRegionLogic) ListRegion() (resp *types.ListRegionResp, err error) {
// todo: add your logic here and delete this line
var regionSlurmArray []model.RegionSlurm
var regionSlurmArray []models.RegionSlurm
var regions []types.Region
var jobCount int64
var regionResult []types.Region
l.svcCtx.DbEngin.Find(&regionSlurmArray)
tool.Convert(regionSlurmArray, &regions)
utils.Convert(regionSlurmArray, &regions)
// 查询超算上的job todo
for _, region := range regions {
if region.RegionName == "Changsha HPC Center" {

4
api/internal/logic/core/participantlistlogic.go
View File

@ -5,7 +5,7 @@ import (
"github.com/zeromicro/go-zero/core/logx"
"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/utils/tool"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
)
type ParticipantListLogic struct {
@ -30,6 +30,6 @@ func (l *ParticipantListLogic) ParticipantList() (resp *types.ParticipantListRes
return nil, tx.Error
}
result := types.ParticipantListResp{}
tool.Convert(participants, &result.Participants)
utils.Convert(participants, &result.Participants)
return &result, nil
}

11
api/internal/logic/core/putresourcepanelconfiglogic.go
View File

@ -2,13 +2,12 @@ package core
import (
"context"
"github.com/zeromicro/go-zero/core/logx"
"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/model"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"time"
"github.com/zeromicro/go-zero/core/logx"
)
type PutResourcePanelConfigLogic struct {
@ -26,8 +25,8 @@ func NewPutResourcePanelConfigLogic(ctx context.Context, svcCtx *svc.ServiceCont
}
func (l *PutResourcePanelConfigLogic) PutResourcePanelConfig(req *types.ResourcePanelConfigReq) error {
rpcModel := model.ResourcePanelConfig{}
tool.Convert(req, &rpcModel)
rpcModel := models.ResourcePanelConfig{}
utils.Convert(req, &rpcModel)
rpcModel.UpdateTime = time.Now()
update := l.svcCtx.DbEngin.Model(&rpcModel).Updates(rpcModel)

14
api/internal/logic/core/savehashcatlogic.go
View File

@ -2,13 +2,11 @@ package core
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
"gitlink.org.cn/jcce-pcm/utils/tool"
"github.com/zeromicro/go-zero/core/logx"
"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"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
)
type SaveHashcatLogic struct {
@ -26,9 +24,9 @@ func NewSaveHashcatLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SaveH
}
func (l *SaveHashcatLogic) SaveHashcat(req *types.SaveHashcatReq) error {
var hashcat model.THashcat
tool.Convert(req, &hashcat)
hashcat.Id = tool.GenSnowflakeID()
var hashcat models.THashcat
utils.Convert(req, &hashcat)
hashcat.Id = utils.GenSnowflakeID()
tx := l.svcCtx.DbEngin.Save(hashcat)
if tx.Error != nil {
return tx.Error

4
api/internal/logic/core/scheduletaskbyyamllogic.go
View File

@ -2,7 +2,7 @@ package core
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"k8s.io/apimachinery/pkg/util/json"
"time"
@ -33,7 +33,7 @@ func (l *ScheduleTaskByYamlLogic) ScheduleTaskByYaml(req *types.ScheduleTaskByYa
return err
}
// 构建任务结构体
taskModel := model.Task{
taskModel := models.Task{
Status: "Saved",
Description: req.Description,
Name: req.Name,

4
api/internal/logic/core/scheduletasklogic.go
View File

@ -6,7 +6,7 @@ import (
"github.com/zeromicro/go-zero/core/logx"
"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/model"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
appv1 "k8s.io/api/apps/v1"
"time"
)
@ -38,7 +38,7 @@ func (l *ScheduleTaskLogic) ScheduleTask(req *types.ScheduleTaskReq) (err error)
return err
}
// construct task info
taskModel := model.Task{
taskModel := models.Task{
Status: "Saved",
Description: req.Description,
Name: req.Name,

15
api/internal/logic/core/submitjoblogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-ac/hpcAC"
"gitlink.org.cn/jcce-pcm/pcm-participant-slurm/hpcTH"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"strconv"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-ac/hpcAC"
"gitlink.org.cn/jcce-pcm/pcm-participant-slurm/hpcTH"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"strconv"
"github.com/zeromicro/go-zero/core/logx"
)
@ -38,7 +37,7 @@ func (l *SubmitJobLogic) SubmitJob(req *types.SubmitJobReq) (resp *types.SubmitJ
switch version {
case "ac":
acReq := &hpcAC.SubmitJobReq{}
err = copier.CopyWithOption(acReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(acReq, req, copier.Option{Converters: utils.Converters})
acResp, err := l.svcCtx.ACRpc.SubmitJob(l.ctx, acReq)
if err != nil {
@ -55,7 +54,7 @@ func (l *SubmitJobLogic) SubmitJob(req *types.SubmitJobReq) (resp *types.SubmitJ
case "th":
thReq := &hpcTH.SubmitJobReq{}
err = copier.CopyWithOption(thReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(thReq, req, copier.Option{Converters: utils.Converters})
tianheResp, err := l.svcCtx.THRpc.SubmitJob(l.ctx, thReq)
if err != nil {

6
api/internal/logic/core/tasklistlogic.go
View File

@ -4,7 +4,7 @@ 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/model"
models2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/utils/enum"
"github.com/zeromicro/go-zero/core/logx"
@ -28,7 +28,7 @@ func (l *TaskListLogic) TaskList() (resp *types.TaskListResp, err error) {
resp = &types.TaskListResp{}
// 查询任务数据
var tasks []model.Task
var tasks []models2.Task
tx := l.svcCtx.DbEngin.Find(&tasks)
if tx.Error != nil {
logx.Error(err)
@ -62,7 +62,7 @@ func (l *TaskListLogic) TaskList() (resp *types.TaskListResp, err error) {
return nil, tx.Error
}
// 运行卡时数
tx = l.svcCtx.DbEngin.Model(&model.Hpc{}).Select("(CASE WHEN SUM(running_time * card_count)/3600 IS NULL THEN 0 ELSE SUM(running_time * card_count)/3600 END )as cardTime").Find(&resp.CardTime)
tx = l.svcCtx.DbEngin.Model(&models2.Hpc{}).Select("(CASE WHEN SUM(running_time * card_count)/3600 IS NULL THEN 0 ELSE SUM(running_time * card_count)/3600 END )as cardTime").Find(&resp.CardTime)
if tx.Error != nil {
return nil, tx.Error
}

4
api/internal/logic/image/datasetchecklogic.go
View File

@ -2,7 +2,7 @@ package image
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/model"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
@ -26,7 +26,7 @@ func NewDataSetCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Data
func (l *DataSetCheckLogic) DataSetCheck(req *types.CheckReq) (resp *types.CheckResp, err error) {
resp = &types.CheckResp{}
var dataSets []model.File
var dataSets []models.File
l.svcCtx.DbEngin.Find(&dataSets).Where("md5", req.FileMd5)
if len(dataSets) != 0 {
resp.Exist = true

15
api/internal/logic/storage/dailypowerscreenlogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewDailyPowerScreenLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
func (l *DailyPowerScreenLogic) DailyPowerScreen(req *types.DailyPowerScreenReq) (resp *types.DailyPowerScreenResp, err error) {
// todo: add your logic here and delete this line
dailyPowerScreenReq := &ceph.DailyPowerScreenReq{}
err = copier.CopyWithOption(dailyPowerScreenReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(dailyPowerScreenReq, req, copier.Option{Converters: utils.Converters})
DailyPowerScreenResp, err := l.svcCtx.CephRpc.DailyPowerScreen(l.ctx, dailyPowerScreenReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db storage list"), "Failed to get db storage list err : %v ,req:%+v", err, req)
@ -43,7 +42,7 @@ func (l *DailyPowerScreenLogic) DailyPowerScreen(req *types.DailyPowerScreenReq)
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &DailyPowerScreenResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &DailyPowerScreenResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

15
api/internal/logic/storage/percentercomputerpowerslogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewPerCenterComputerPowersLogic(ctx context.Context, svcCtx *svc.ServiceCon
func (l *PerCenterComputerPowersLogic) PerCenterComputerPowers(req *types.PerCenterComputerPowersReq) (resp *types.PerCenterComputerPowersResp, err error) {
// todo: add your logic here and delete this line
perCenterComputerPowersReq := &ceph.PerCenterComputerPowersReq{}
err = copier.CopyWithOption(perCenterComputerPowersReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(perCenterComputerPowersReq, req, copier.Option{Converters: utils.Converters})
PerCenterComputerPowersResp, err := l.svcCtx.CephRpc.PerCenterComputerPowerScreen(l.ctx, perCenterComputerPowersReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db storage list"), "Failed to get db storage list err : %v ,req:%+v", err, req)
@ -43,7 +42,7 @@ func (l *PerCenterComputerPowersLogic) PerCenterComputerPowers(req *types.PerCen
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &PerCenterComputerPowersResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &PerCenterComputerPowersResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

15
api/internal/logic/storage/screenstoragelogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewScreenStorageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Scr
func (l *ScreenStorageLogic) ScreenStorage(req *types.StorageScreenReq) (resp *types.StorageScreenResp, err error) {
// todo: add your logic here and delete this line
storageScreenReq := &ceph.StorageScreenReq{}
err = copier.CopyWithOption(storageScreenReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(storageScreenReq, req, copier.Option{Converters: utils.Converters})
StorageScreenResp, err := l.svcCtx.CephRpc.StorageScreen(l.ctx, storageScreenReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db storage list"), "Failed to get db storage list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *ScreenStorageLogic) ScreenStorage(req *types.StorageScreenReq) (resp *t
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &StorageScreenResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &StorageScreenResp, copier.Option{Converters: utils.Converters})
return resp, nil
}

3
api/internal/logic/storelink/deletelinkimagelogic.go
View File

@ -2,8 +2,7 @@ package storelink
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"

3
api/internal/logic/storelink/deletelinktasklogic.go
View File

@ -2,8 +2,7 @@ package storelink
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"

5
api/internal/logic/storelink/getlinkimagelistlogic.go
View File

@ -2,11 +2,10 @@ package storelink
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink"
"github.com/zeromicro/go-zero/core/logx"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink"
"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 GetLinkImageListLogic struct {

3
api/internal/logic/storelink/getlinktasklogic.go
View File

@ -2,8 +2,7 @@ package storelink
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"

3
api/internal/logic/storelink/submitlinktasklogic.go
View File

@ -2,8 +2,7 @@ package storelink
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"

3
api/internal/logic/storelink/uploadlinkimagelogic.go
View File

@ -2,8 +2,7 @@ package storelink
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"

15
api/internal/logic/vm/createimagelogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewCreateImageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Creat
func (l *CreateImageLogic) CreateImage(req *types.CreateImageReq) (resp *types.CreateImageResp, err error) {
// todo: add your logic here and delete this line
CreateImageReq := &openstack.CreateImageReq{}
err = copier.CopyWithOption(CreateImageReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(CreateImageReq, req, copier.Option{Converters: utils.Converters})
CreateImageResp, err := l.svcCtx.OpenstackRpc.CreateImage(l.ctx, CreateImageReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("c端创建失败"), "c端创建失败 : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *CreateImageLogic) CreateImage(req *types.CreateImageReq) (resp *types.C
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateImageResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateImageResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/createnetworklogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewCreateNetworkLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cre
func (l *CreateNetworkLogic) CreateNetwork(req *types.CreateNetworkReq) (resp *types.CreateNetworkResp, err error) {
// todo: add your logic here and delete this line
CreateNetworkReq := &openstack.CreateNetworkReq{}
err = copier.CopyWithOption(CreateNetworkReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(CreateNetworkReq, req, copier.Option{Converters: utils.Converters})
CreateNetworkResp, err := l.svcCtx.OpenstackRpc.CreateNetwork(l.ctx, CreateNetworkReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *CreateNetworkLogic) CreateNetwork(req *types.CreateNetworkReq) (resp *t
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateNetworkResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateNetworkResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/createserverlogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewCreateServerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Crea
func (l *CreateServerLogic) CreateServer(req *types.CreateServerReq) (resp *types.CreateServerResp, err error) {
// todo: add your logic here and delete this line
CreateServerReq := &openstack.CreateServerReq{}
err = copier.CopyWithOption(CreateServerReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(CreateServerReq, req, copier.Option{Converters: utils.Converters})
CreateServerResp, err := l.svcCtx.OpenstackRpc.CreateServer(l.ctx, CreateServerReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *CreateServerLogic) CreateServer(req *types.CreateServerReq) (resp *type
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateServerResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateServerResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/createsubnetlogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewCreateSubnetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Crea
func (l *CreateSubnetLogic) CreateSubnet(req *types.CreateSubnetReq) (resp *types.CreateSubnetResp, err error) {
// todo: add your logic here and delete this line
CreateSubnetReq := &openstack.CreateSubnetReq{}
err = copier.CopyWithOption(CreateSubnetReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(CreateSubnetReq, req, copier.Option{Converters: utils.Converters})
CreateSubnetResp, err := l.svcCtx.OpenstackRpc.CreateSubnet(l.ctx, CreateSubnetReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *CreateSubnetLogic) CreateSubnet(req *types.CreateSubnetReq) (resp *type
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateSubnetResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateSubnetResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/createvolumelogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewCreateVolumeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Crea
func (l *CreateVolumeLogic) CreateVolume(req *types.CreateVolumeReq) (resp *types.CreateVolumeResp, err error) {
// todo: add your logic here and delete this line
CreateVolumeReq := &openstack.CreateVolumeReq{}
err = copier.CopyWithOption(CreateVolumeReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(CreateVolumeReq, req, copier.Option{Converters: utils.Converters})
CreateVolumeResp, err := l.svcCtx.OpenstackRpc.CreateVolume(l.ctx, CreateVolumeReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *CreateVolumeLogic) CreateVolume(req *types.CreateVolumeReq) (resp *type
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateVolumeResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateVolumeResp, copier.Option{Converters: utils.Converters})
return resp, err
}

17
api/internal/logic/vm/deleteimagelogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,16 +32,16 @@ func NewDeleteImageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Delet
func (l *DeleteImageLogic) DeleteImage(req *types.DeleteImageReq) (resp *types.DeleteImageResp, err error) {
// todo: add your logic here and delete this line
DeleteImageReq := &openstack.DeleteImageReq{}
err = copier.CopyWithOption(DeleteImageReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(DeleteImageReq, req, copier.Option{Converters: utils.Converters})
DeleteImageResp, err := l.svcCtx.OpenstackRpc.DeleteImage(l.ctx, DeleteImageReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&DeleteImageResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &DeleteImageResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &DeleteImageResp, copier.Option{Converters: utils.Converters})
return resp, err
}

17
api/internal/logic/vm/deletenetworklogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,16 +32,16 @@ func NewDeleteNetworkLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Del
func (l *DeleteNetworkLogic) DeleteNetwork(req *types.DeleteNetworkReq) (resp *types.DeleteNetworkResp, err error) {
// todo: add your logic here and delete this line
DeleteNetworkReq := &openstack.DeleteNetworkReq{}
err = copier.CopyWithOption(DeleteNetworkReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(DeleteNetworkReq, req, copier.Option{Converters: utils.Converters})
DeleteNetworkResp, err := l.svcCtx.OpenstackRpc.DeleteNetwork(l.ctx, DeleteNetworkReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to delete network "), "Failed to delete network err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&DeleteNetworkResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &DeleteNetworkResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &DeleteNetworkResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/deleteserverlogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewDeleteServerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Dele
func (l *DeleteServerLogic) DeleteServer(req *types.DeleteServerReq) (resp *types.DeleteServerResp, err error) {
// todo: add your logic here and delete this line
DeleteServerReq := &openstack.DeleteServerReq{}
err = copier.CopyWithOption(DeleteServerReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(DeleteServerReq, req, copier.Option{Converters: utils.Converters})
DeleteServerResp, err := l.svcCtx.OpenstackRpc.DeleteServer(l.ctx, DeleteServerReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *DeleteServerLogic) DeleteServer(req *types.DeleteServerReq) (resp *type
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &DeleteServerResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &DeleteServerResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/deletevolumelogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewDeleteVolumeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Dele
func (l *DeleteVolumeLogic) DeleteVolume(req *types.DeleteVolumeReq) (resp *types.DeleteVolumeResp, err error) {
// todo: add your logic here and delete this line
DeleteVolumeReq := &openstack.DeleteVolumeReq{}
err = copier.CopyWithOption(DeleteVolumeReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(DeleteVolumeReq, req, copier.Option{Converters: utils.Converters})
DeleteVolumeResp, err := l.svcCtx.OpenstackRpc.DeleteVolume(l.ctx, DeleteVolumeReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *DeleteVolumeLogic) DeleteVolume(req *types.DeleteVolumeReq) (resp *type
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &DeleteVolumeResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &DeleteVolumeResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/getcomputelimitslogic.go
View File

@ -5,13 +5,12 @@ import (
"encoding/json"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"github.com/zeromicro/go-zero/core/logx"
)
@ -32,16 +31,16 @@ func NewGetComputeLimitsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
func (l *GetComputeLimitsLogic) GetComputeLimits(req *types.GetComputeLimitsReq) (resp *types.GetComputeLimitsResp, err error) {
GetComputeLimitsReq := &openstack.GetComputeLimitsReq{}
err = copier.CopyWithOption(GetComputeLimitsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(GetComputeLimitsReq, req, copier.Option{Converters: utils.Converters})
GetComputeLimitsResp, err := l.svcCtx.OpenstackRpc.GetComputeLimits(l.ctx, GetComputeLimitsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&GetComputeLimitsResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &GetComputeLimitsResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &GetComputeLimitsResp, copier.Option{Converters: utils.Converters})
return resp, err
}

13
api/internal/logic/vm/getvolumelimitslogic.go
View File

@ -5,13 +5,12 @@ import (
"encoding/json"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"github.com/zeromicro/go-zero/core/logx"
)
@ -32,7 +31,7 @@ func NewGetVolumeLimitsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *G
func (l *GetVolumeLimitsLogic) GetVolumeLimits(req *types.GetVolumeLimitsReq) (resp *types.GetVolumeLimitsResp, err error) {
GetVolumeLimitsReq := &openstack.GetVolumeLimitsReq{}
err = copier.CopyWithOption(GetVolumeLimitsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(GetVolumeLimitsReq, req, copier.Option{Converters: utils.Converters})
GetVolumeLimitsResp, err := l.svcCtx.OpenstackRpc.GetVolumeLimits(l.ctx, GetVolumeLimitsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -42,6 +41,6 @@ func (l *GetVolumeLimitsLogic) GetVolumeLimits(req *types.GetVolumeLimitsReq) (r
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &GetVolumeLimitsResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &GetVolumeLimitsResp, copier.Option{Converters: utils.Converters})
return resp, err
}

17
api/internal/logic/vm/listflavorsdetaillogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,16 +32,16 @@ func NewListFlavorsDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *ListFlavorsDetailLogic) ListFlavorsDetail(req *types.ListFlavorsDetailReq) (resp *types.ListFlavorsDetailResp, err error) {
// todo: add your logic here and delete this line
ListFlavorsDetailReq := &openstack.ListFlavorsDetailReq{}
err = copier.CopyWithOption(ListFlavorsDetailReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(ListFlavorsDetailReq, req, copier.Option{Converters: utils.Converters})
ListFlavorsDetailResp, err := l.svcCtx.OpenstackRpc.ListFlavorsDetail(l.ctx, ListFlavorsDetailReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&ListFlavorsDetailResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListFlavorsDetailResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListFlavorsDetailResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/listimageslogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewListImagesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListIm
func (l *ListImagesLogic) ListImages(req *types.ListImagesReq) (resp *types.ListImagesResp, err error) {
// todo: add your logic here and delete this line
ListImagesReq := &openstack.ListImagesReq{}
err = copier.CopyWithOption(ListImagesReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(ListImagesReq, req, copier.Option{Converters: utils.Converters})
ListImagesResp, err := l.svcCtx.OpenstackRpc.LisImages(l.ctx, ListImagesReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *ListImagesLogic) ListImages(req *types.ListImagesReq) (resp *types.List
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListImagesResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListImagesResp, copier.Option{Converters: utils.Converters})
return resp, err
}

15
api/internal/logic/vm/listnetworkslogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"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/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,7 +32,7 @@ func NewListNetworksLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List
func (l *ListNetworksLogic) ListNetworks(req *types.ListNetworksReq) (resp *types.ListNetworksResp, err error) {
// todo: add your logic here and delete this line
ListNetworksReq := &openstack.ListNetworksReq{}
err = copier.CopyWithOption(ListNetworksReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(ListNetworksReq, req, copier.Option{Converters: utils.Converters})
ListNetworksResp, err := l.svcCtx.OpenstackRpc.ListNetworks(l.ctx, ListNetworksReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
@ -43,6 +42,6 @@ func (l *ListNetworksLogic) ListNetworks(req *types.ListNetworksReq) (resp *type
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListNetworksResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListNetworksResp, copier.Option{Converters: utils.Converters})
return resp, err
}

13
api/internal/logic/vm/listserverlogic.go
View File

@ -4,15 +4,14 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/logx"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
type ListServerLogic struct {
@ -32,16 +31,16 @@ func NewListServerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListSe
func (l *ListServerLogic) ListServer(req *types.ListServersReq) (resp *types.ListServersResp, err error) {
// todo: add your logic here and delete this line
ListServersReq := &openstack.ListServersReq{}
err = copier.CopyWithOption(ListServersReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(ListServersReq, req, copier.Option{Converters: utils.Converters})
ListServersResp, err := l.svcCtx.OpenstackRpc.ListServers(l.ctx, ListServersReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&ListServersResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListServersResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListServersResp, copier.Option{Converters: utils.Converters})
return resp, err
}

17
api/internal/logic/vm/listserversdetailedlogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,17 +32,17 @@ func NewListServersDetailedLogic(ctx context.Context, svcCtx *svc.ServiceContext
func (l *ListServersDetailedLogic) ListServersDetailed(req *types.ListServersDetailedReq) (resp *types.ListServersDetailedResp, err error) {
// todo: add your logic here and delete this line
ListServersDetailedReq := &openstack.ListServersDetailedReq{}
err = copier.CopyWithOption(ListServersDetailedReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(ListServersDetailedReq, req, copier.Option{Converters: utils.Converters})
ListServersDetailedResp, err := l.svcCtx.OpenstackRpc.ListServersDetailed(l.ctx, ListServersDetailedReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&ListServersDetailedResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListServersDetailedResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListServersDetailedResp, copier.Option{Converters: utils.Converters})
return resp, err
}

17
api/internal/logic/vm/listvolumesdetaillogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,17 +32,17 @@ func NewListVolumesDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *ListVolumesDetailLogic) ListVolumesDetail(req *types.ListVolumesDetailReq) (resp *types.ListVolumesDetailResp, err error) {
// todo: add your logic here and delete this line
ListVolumesDetailReq := &openstack.ListVolumesDetailReq{}
err = copier.CopyWithOption(ListVolumesDetailReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(ListVolumesDetailReq, req, copier.Option{Converters: utils.Converters})
ListVolumesDetailResp, err := l.svcCtx.OpenstackRpc.ListVolumesDetail(l.ctx, ListVolumesDetailReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Volumes list"), "Failed to get db Volumes list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&ListVolumesDetailResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListVolumesDetailResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListVolumesDetailResp, copier.Option{Converters: utils.Converters})
return resp, err
}

17
api/internal/logic/vm/listvolumetypeslogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,16 +32,16 @@ func NewListVolumeTypesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *L
func (l *ListVolumeTypesLogic) ListVolumeTypes(req *types.ListVolumeTypesReq) (resp *types.ListVolumeTypesResp, err error) {
// todo: add your logic here and delete this line
ListVolumeTypesReq := &openstack.ListVolumeTypesReq{}
err = copier.CopyWithOption(ListVolumeTypesReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(ListVolumeTypesReq, req, copier.Option{Converters: utils.Converters})
ListVolumeTypesResp, err := l.svcCtx.OpenstackRpc.ListVolumeTypes(l.ctx, ListVolumeTypesReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Volumes list"), "Failed to get db Volumes list err : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&ListVolumeTypesResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ListVolumeTypesResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &ListVolumeTypesResp, copier.Option{Converters: utils.Converters})
return resp, err
}

17
api/internal/logic/vm/uploadimagelogic.go
View File

@ -4,14 +4,13 @@ import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/result"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/xerr"
"k8s.io/apimachinery/pkg/util/json"
"github.com/zeromicro/go-zero/core/logx"
)
@ -33,16 +32,16 @@ func NewUploadImageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Uploa
func (l *UploadImageLogic) UploadImage(req *types.UploadOsImageReq) (resp *types.UploadOsImageResp, err error) {
// todo: add your logic here and delete this line
UploadOsImageReq := &openstack.UploadOsImageReq{}
err = copier.CopyWithOption(UploadOsImageReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(UploadOsImageReq, req, copier.Option{Converters: utils.Converters})
CreateImageResp, err := l.svcCtx.OpenstackRpc.UploadImage(l.ctx, UploadOsImageReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("c端创建失败"), "c端创建失败 : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&CreateImageResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
return nil, error2.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &CreateImageResp, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(&resp, &CreateImageResp, copier.Option{Converters: utils.Converters})
return resp, err
}

6
api/internal/mqs/kq/ScheduleAi.go
View File

@ -2,8 +2,8 @@ package kq
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/scheduler"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
scheduler2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler"
)
/*
@ -24,8 +24,8 @@ func NewScheduleAiMq(ctx context.Context, svcCtx *svc.ServiceContext) *ScheduleA
func (l *ScheduleAiMq) Consume(_, val string) error {
// 接受消息, 根据标签筛选过滤
aiSchdl := scheduler.NewAiScheduler(val)
schdl, err := scheduler.NewScheduler(aiSchdl, val, l.svcCtx.DbEngin)
aiSchdl := scheduler2.NewAiScheduler(val)
schdl, err := scheduler2.NewScheduler(aiSchdl, val, l.svcCtx.DbEngin)
if err != nil {
return err
}

6
api/internal/mqs/kq/ScheduleCloud.go
View File

@ -2,8 +2,8 @@ package kq
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/scheduler"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
scheduler2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler"
)
/*
@ -24,8 +24,8 @@ func NewScheduleCloudMq(ctx context.Context, svcCtx *svc.ServiceContext) *Schedu
func (l *ScheduleCloudMq) Consume(_, val string) error {
// 接受消息, 根据标签筛选过滤
cloudScheduler := scheduler.NewCloudScheduler()
schdl, err := scheduler.NewScheduler(cloudScheduler, val, l.svcCtx.DbEngin)
cloudScheduler := scheduler2.NewCloudScheduler()
schdl, err := scheduler2.NewScheduler(cloudScheduler, val, l.svcCtx.DbEngin)
if err != nil {
return err
}

6
api/internal/mqs/kq/ScheduleHpc.go
View File

@ -2,8 +2,8 @@ package kq
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/scheduler"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
scheduler2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler"
)
/*
@ -24,8 +24,8 @@ func NewScheduleHpcMq(ctx context.Context, svcCtx *svc.ServiceContext) *Schedule
func (l *ScheduleHpcMq) Consume(_, val string) error {
// 接受消息, 根据标签筛选过滤
hpcSchdl := scheduler.NewHpcScheduler(val)
schdl, err := scheduler.NewScheduler(hpcSchdl, val, l.svcCtx.DbEngin)
hpcSchdl := scheduler2.NewHpcScheduler(val)
schdl, err := scheduler2.NewScheduler(hpcSchdl, val, l.svcCtx.DbEngin)
if err != nil {
return err
}

4
api/internal/pkg/storeLink/octopus.go → api/internal/storeLink/octopus.go
View File

@ -28,8 +28,8 @@ func (o *OctopusLink) UploadImage(path string) (interface{}, error) {
Platform: o.platform,
CreateImage: &octopus.CreateImage{
SourceType: 1,
//ImageName: IMG_NAME_PREFIX + tool.RandomString(5),
//ImageVersion: IMG_VERSION_PREFIX + tool.RandomString(7),
//ImageName: IMG_NAME_PREFIX + utils.RandomString(5),
//ImageVersion: IMG_VERSION_PREFIX + utils.RandomString(7),
},
}
createResp, err := o.svcCtx.OctopusRpc.CreateImage(o.ctx, createReq)

0
api/internal/pkg/storeLink/storeLink.go → api/internal/storeLink/storeLink.go
View File

4
api/internal/svc/servicecontext.go
View File

@ -12,13 +12,13 @@ import (
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/zrpc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/config"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"gitlink.org.cn/jcce-pcm/pcm-participant-ac/hpcacclient"
"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/cephclient"
"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelartsclient"
"gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopusclient"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstackclient"
"gitlink.org.cn/jcce-pcm/pcm-participant-slurm/hpcthclient"
"gitlink.org.cn/jcce-pcm/utils/tool"
"gorm.io/driver/mysql"
"gorm.io/gorm"
"gorm.io/gorm/schema"
@ -53,7 +53,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
S3ForcePathStyle: aws.Bool(true), //使用路径样式而非虚拟主机样式,区别请参考:https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
})
//添加snowflake支持
err := tool.InitSnowflake(c.SnowflakeConf.MachineId)
err := utils.InitSnowflake(c.SnowflakeConf.MachineId)
if err != nil {
logx.Errorf("InitSnowflake err: ", err)
panic("InitSnowflake err")

8
api/pcm.go
View File

@ -10,7 +10,7 @@ import (
"github.com/zeromicro/go-zero/rest"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/config"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/handler"
kqMq "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/mqs/kq"
kq3 "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/mqs/kq"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
commonConfig "gitlink.org.cn/jcce-pcm/utils/nacos"
)
@ -55,9 +55,9 @@ func main() {
serviceGroup.Add(server)
services := []service.Service{
//Listening for changes in consumption flow status
kq.MustNewQueue(c.HpcConsumerConf, kqMq.NewScheduleHpcMq(context.Background(), ctx)),
kq.MustNewQueue(c.CloudConsumerConf, kqMq.NewScheduleCloudMq(context.Background(), ctx)),
kq.MustNewQueue(c.AiConsumerConf, kqMq.NewScheduleAiMq(context.Background(), ctx)),
kq.MustNewQueue(c.HpcConsumerConf, kq3.NewScheduleHpcMq(context.Background(), ctx)),
kq.MustNewQueue(c.CloudConsumerConf, kq3.NewScheduleCloudMq(context.Background(), ctx)),
kq.MustNewQueue(c.AiConsumerConf, kq3.NewScheduleAiMq(context.Background(), ctx)),
//.....
}

9
api/pkg/response/Task.go Normal file
View File

@ -0,0 +1,9 @@
package response
type TaskInfo struct {
TaskId int64 `json:"taskId,optional"`
TaskType string `json:"taskType,optional"`
MatchLabels map[string]string `json:"matchLabels"`
ParticipantId int64 `json:"participantId"`
Metadata interface{} `json:"metadata"`
}

16
go.mod
View File

@ -3,13 +3,18 @@ module gitlink.org.cn/jcce-pcm/pcm-coordinator
go 1.20
require (
github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c
github.com/Masterminds/squirrel v1.5.4
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704
github.com/aws/aws-sdk-go v1.44.325
github.com/bwmarrin/snowflake v0.3.0
github.com/docker/docker v24.0.5+incompatible
github.com/go-redis/redis v6.15.9+incompatible
github.com/go-redis/redis/v8 v8.11.5
github.com/go-resty/resty/v2 v2.7.0
github.com/go-sql-driver/mysql v1.7.1
github.com/jinzhu/copier v0.3.5
github.com/nacos-group/nacos-sdk-go/v2 v2.2.3
github.com/pkg/errors v0.9.1
github.com/robfig/cron/v3 v3.0.1
github.com/shopspring/decimal v1.3.1
@ -22,6 +27,7 @@ require (
gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20230904093908-860f0b2b4eb4
gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714030125-a52fa198ddf4
gitlink.org.cn/jcce-pcm/utils v0.0.2
go.opentelemetry.io/otel/trace v1.14.0
gonum.org/v1/gonum v0.11.0
google.golang.org/grpc v1.57.0
google.golang.org/protobuf v1.31.0
@ -29,6 +35,8 @@ require (
gorm.io/gorm v1.25.3
k8s.io/api v0.26.3
k8s.io/apimachinery v0.27.3
k8s.io/client-go v0.26.3
sigs.k8s.io/yaml v1.3.0
)
//replace gitlink.org.cn/jcce-pcm/utils v0.0.2 => gitlink.org.cn/jcce-pcm/utils v0.0.0-20230914022307-7d2bc2c3a28f
@ -36,12 +44,9 @@ require (
replace github.com/zeromicro/go-zero v1.5.5 => github.com/zeromicro/go-zero v1.5.3
require (
github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/bwmarrin/snowflake v0.3.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
@ -58,7 +63,6 @@ require (
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-resty/resty/v2 v2.7.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/mock v1.6.0 // indirect
@ -85,7 +89,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nacos-group/nacos-sdk-go/v2 v2.2.3 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/openzipkin/zipkin-go v0.4.1 // indirect
@ -109,7 +112,6 @@ require (
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/zipkin v1.14.0 // indirect
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
go.opentelemetry.io/otel/trace v1.14.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/automaxprocs v1.5.3 // indirect
@ -134,11 +136,9 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.0 // indirect
k8s.io/client-go v0.26.3 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

18
pkg/constants/task.go Normal file
View File

@ -0,0 +1,18 @@
package constants
// 任务类型
const (
TASK_TYPE_CLOUD = 1
TASK_TYPE_HPC = 2
TASK_TYPE_AI = 3
)
// 任务状态
const (
TASK_STATUS_SAVED = 1
TASK_STATUS_INIT = 2
TASK_STATUS_RUNNING = 3
TASK_STATUS_FAILED = 4
TASK_STATUS_END = 5
TASK_STATUS_UNKNOW = 6
)

23
pkg/enum/acEnum.go Normal file
View File

@ -0,0 +1,23 @@
package enum
type AcStatus string
const (
statR AcStatus = "statR"
statC AcStatus = "statC"
statQ AcStatus = "statQ"
statW AcStatus = "statW"
)
func (s AcStatus) String() string {
switch s {
case statR:
return "Running"
case statC:
return "Completed"
case statQ, statW:
return "Pending"
default:
return ""
}
}

28
pkg/enum/externalStatusEnum.go Normal file
View File

@ -0,0 +1,28 @@
package enum
type ExternalStatus string
const (
EXTERNAL_RUNNING ExternalStatus = "running"
EXTERNAL_COMPLETED ExternalStatus = "completed"
EXTERNAL_PENDING ExternalStatus = "pending"
EXTERNAL_SUCCEEDED ExternalStatus = "succeeded"
EXTERNAL_FAILED ExternalStatus = "failed"
)
func (s ExternalStatus) String() string {
switch s {
case EXTERNAL_RUNNING:
return "Running"
case EXTERNAL_COMPLETED:
return "Completed"
case EXTERNAL_PENDING:
return "Pending"
case EXTERNAL_SUCCEEDED:
return "Succeeded"
case EXTERNAL_FAILED:
return "Failed"
default:
return ""
}
}

25
pkg/enum/partnerEnum.go Normal file
View File

@ -0,0 +1,25 @@
package enum
type Partner string
const (
AC Partner = "ac"
TH Partner = "th"
KubeNative Partner = "kubeNative"
ModelArts Partner = "modelArts"
)
func (p Partner) String() string {
switch p {
case AC:
return "曙光超算"
case KubeNative:
return "长沙云算"
case ModelArts:
return "南京智算"
case TH:
return "天河超算"
default:
return ""
}
}

19
pkg/enum/synergyStatusEnum.go Normal file
View File

@ -0,0 +1,19 @@
package enum
type SynergyStatus int64
const (
SYNERGIZED SynergyStatus = 0
NOT_SYNERGIZED SynergyStatus = 1
)
func (s SynergyStatus) String() string {
switch s {
case SYNERGIZED:
return "已协同"
case NOT_SYNERGIZED:
return "未协同"
default:
return ""
}
}

25
pkg/enum/tianheEnum.go Normal file
View File

@ -0,0 +1,25 @@
package enum
type State uint32
const (
pending State = 0
running State = 1
suspended State = 2
completed State = 3
)
func (s State) String() string {
switch s {
case pending:
return "Pending"
case running:
return "Running"
case suspended:
return "Suspended"
case completed:
return "Completed"
default:
return ""
}
}

33
pkg/helper/interceptor/rpcserver/loggerInterceptor.go Normal file
View File

@ -0,0 +1,33 @@
package rpcserver
import (
"context"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/logx"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
// LoggerInterceptor rpc service logger interceptor
func LoggerInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) {
resp, err = handler(ctx, req)
if err != nil {
causeErr := errors.Cause(err) // err类型
if e, ok := causeErr.(*xerr.CodeError); ok { //自定义错误类型
logx.WithContext(ctx).Errorf("【RPC-SRV-ERR】 %+v", err)
//转成grpc err
err = status.Error(codes.Code(e.GetErrCode()), e.GetErrMsg())
} else {
logx.WithContext(ctx).Errorf("【RPC-SRV-ERR】 %+v", err)
}
}
return resp, err
}

227
pkg/helper/nacos/nacos.go Normal file
View File

@ -0,0 +1,227 @@
package nacos
import (
"context"
"encoding/json"
"fmt"
"github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos"
"github.com/nacos-group/nacos-sdk-go/v2/clients"
"github.com/nacos-group/nacos-sdk-go/v2/clients/nacos_client"
"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client/naming_cache"
"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client/naming_proxy"
"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
"github.com/nacos-group/nacos-sdk-go/v2/common/http_agent"
"github.com/nacos-group/nacos-sdk-go/v2/common/nacos_server"
"github.com/nacos-group/nacos-sdk-go/v2/common/security"
"github.com/nacos-group/nacos-sdk-go/v2/vo"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/rest"
"github.com/zeromicro/go-zero/zrpc"
nacosVo "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/nacos/vo"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
"net/http"
"sync"
)
type (
BootstrapConfig struct {
NacosConfig NacosConfig
}
ListenConfig func(data string)
NacosServerConfig struct {
IpAddr string
Port uint64
}
NacosClientConfig struct {
NamespaceId string
TimeoutMs uint64
NotLoadCacheAtStart bool
LogDir string
CacheDir string
LogLevel string
}
NacosConfig struct {
ServerConfigs []NacosServerConfig
ClientConfig NacosClientConfig
DataId string
Group string
}
)
// NamingClient ...
type NamingClient struct {
nacos_client.INacosClient
ctx context.Context
cancel context.CancelFunc
serviceProxy naming_proxy.INamingProxy
serviceInfoHolder *naming_cache.ServiceInfoHolder
clientConfig constant.ClientConfig
}
func (n *NacosConfig) Discovery(c *zrpc.RpcServerConf) {
sc, cc := n.buildConfig()
opts := nacos.NewNacosConfig(c.Name, c.ListenOn, sc, &cc)
opts.Group = n.Group
err := nacos.RegisterService(opts)
if err != nil {
panic(err)
}
}
func (n *NacosConfig) DiscoveryRest(c *rest.RestConf) {
sc, cc := n.buildConfig()
opts := nacos.NewNacosConfig(c.Name, fmt.Sprintf("%s:%d", c.Host, c.Port), sc, &cc)
err := nacos.RegisterService(opts)
if err != nil {
panic(err)
}
}
func (n *NacosConfig) InitConfig(listenConfigCallback ListenConfig) string {
//nacos server
sc, cc := n.buildConfig()
pa := vo.NacosClientParam{
ClientConfig: &cc,
ServerConfigs: sc,
}
configClient, err := clients.NewConfigClient(pa)
if err != nil {
panic(err)
}
//获取配置中心内容
content, err := configClient.GetConfig(vo.ConfigParam{
DataId: n.DataId,
Group: n.Group,
})
if err != nil {
panic(err)
}
//设置配置监听
if err = configClient.ListenConfig(vo.ConfigParam{
DataId: n.DataId,
Group: n.Group,
OnChange: func(namespace, group, dataId, data string) {
//配置文件产生变化就会触发
if len(data) == 0 {
logx.Errorf("listen nacos data nil error , namespace : %s，group : %s , dataId : %s , data : %s", namespace, group, dataId, data)
return
}
listenConfigCallback(data)
},
}); err != nil {
panic(err)
}
if len(content) == 0 {
panic("read nacos nacos content err , content is nil")
}
return content
}
func (n *NacosConfig) buildConfig() ([]constant.ServerConfig, constant.ClientConfig) {
var sc []constant.ServerConfig
if len(n.ServerConfigs) == 0 {
panic("nacos server no set")
}
for _, serveConfig := range n.ServerConfigs {
sc = append(sc, constant.ServerConfig{
Port: serveConfig.Port,
IpAddr: serveConfig.IpAddr,
},
)
}
//nacos client
cc := constant.ClientConfig{
NamespaceId: n.ClientConfig.NamespaceId,
TimeoutMs: n.ClientConfig.TimeoutMs,
NotLoadCacheAtStart: n.ClientConfig.NotLoadCacheAtStart,
LogDir: n.ClientConfig.LogDir,
CacheDir: n.ClientConfig.CacheDir,
LogLevel: n.ClientConfig.LogLevel,
}
return sc, cc
}
type NacosServer struct {
sync.RWMutex
securityLogin security.AuthClient
serverList []constant.ServerConfig
httpAgent http_agent.IHttpAgent
timeoutMs uint64
endpoint string
lastSrvRefTime int64
vipSrvRefInterMills int64
contextPath string
currentIndex int32
ServerSrcChangeSignal chan struct{}
}
// GetAllServicesInfo Get all Services
func (n *NacosConfig) GetAllServicesInfo() (nacosVo.NacosServiceList, error) {
nacosServiceList := nacosVo.NacosServiceList{}
api := constant.SERVICE_BASE_PATH + "/catalog/services"
nacosServer, err := nacos_server.NewNacosServer(context.Background(),
[]constant.ServerConfig{*constant.NewServerConfig(n.ServerConfigs[0].IpAddr, n.ServerConfigs[0].Port)},
constant.ClientConfig{},
&http_agent.HttpAgent{},
1000,
"")
if err != nil {
return nacosServiceList, err
}
params := map[string]string{}
params["namespaceId"] = n.ClientConfig.NamespaceId
params["groupName"] = ""
params["pageNo"] = "1"
params["pageSize"] = "10000"
result, err := nacosServer.ReqApi(api, params, http.MethodGet, constant.ClientConfig{})
if err != nil {
logx.Errorf("Failed to get all services ,error: <%+v>, namespace : <%s> ", err, n.ClientConfig.NamespaceId)
return nacosServiceList, err
}
err1 := json.Unmarshal([]byte(result), &nacosServiceList)
if err1 != nil {
logx.Errorf("Conversion failed ,error: %+v, str: %s", err1, result)
return nacosServiceList, err
}
return nacosServiceList, err
}
// GetAllGroupName Get all GroupName
func (n *NacosConfig) GetAllGroupName() (nacosGroupList nacosVo.NacosGroupList, err error) {
nacosServiceList := nacosVo.NacosServiceList{}
api := constant.SERVICE_BASE_PATH + "/catalog/services"
nacosServer, err := nacos_server.NewNacosServer(context.Background(),
[]constant.ServerConfig{*constant.NewServerConfig(n.ServerConfigs[0].IpAddr, n.ServerConfigs[0].Port)},
constant.ClientConfig{},
&http_agent.HttpAgent{},
1000,
"")
if err != nil {
return nacosGroupList, err
}
params := map[string]string{}
params["namespaceId"] = "test"
params["groupName"] = ""
params["pageNo"] = "1"
params["pageSize"] = "10000"
result, err := nacosServer.ReqApi(api, params, http.MethodGet, constant.ClientConfig{})
err1 := json.Unmarshal([]byte(result), &nacosServiceList)
if err1 != nil {
logx.Errorf("Conversion failed ,error: %+v, str: %s", err1, result)
return nacosGroupList, err1
}
for _, v := range nacosServiceList.ServiceList {
nacosGroupList.GroupName = append(nacosGroupList.GroupName, v.GroupName)
}
nacosGroupList.GroupName = utils.RemoveDuplication_map(nacosGroupList.GroupName)
return nacosGroupList, err
}

5
pkg/helper/nacos/vo/nacos_group.go Normal file
View File

@ -0,0 +1,5 @@
package vo
type NacosGroupList struct {
GroupName []string `json:"groupName"`
}

8
pkg/helper/nacos/vo/nacos_service.go Normal file
View File

@ -0,0 +1,8 @@
package vo
import "github.com/aliyun/alibaba-cloud-sdk-go/services/mse"
type NacosServiceList struct {
Count int `json:"count"`
ServiceList []mse.SimpleNacosAnsService `json:"serviceList"`
}

16
pkg/helper/xerr/errCode.go Normal file
View File

@ -0,0 +1,16 @@
package xerr
// 成功返回
const OK uint32 = 200
/**(前3位代表业务,后三位代表具体功能)**/
// 全局错误码
const SERVER_COMMON_ERROR uint32 = 100001
const REUQEST_PARAM_ERROR uint32 = 100002
const TOKEN_EXPIRE_ERROR uint32 = 100003
const TOKEN_GENERATE_ERROR uint32 = 100004
const DB_ERROR uint32 = 100005
const DB_UPDATE_AFFECTED_ZERO_ERROR uint32 = 100006
//用户模块

30
pkg/helper/xerr/errMsg.go Normal file
View File

@ -0,0 +1,30 @@
package xerr
var message map[uint32]string
func init() {
message = make(map[uint32]string)
message[OK] = "SUCCESS"
message[SERVER_COMMON_ERROR] = "服务器开小差啦,稍后再来试一试"
message[REUQEST_PARAM_ERROR] = "参数错误"
message[TOKEN_EXPIRE_ERROR] = "token失效，请重新登陆"
message[TOKEN_GENERATE_ERROR] = "生成token失败"
message[DB_ERROR] = "数据库繁忙,请稍后再试"
message[DB_UPDATE_AFFECTED_ZERO_ERROR] = "更新数据影响行数为0"
}
func MapErrMsg(errcode uint32) string {
if msg, ok := message[errcode]; ok {
return msg
} else {
return "服务器开小差啦,稍后再来试一试"
}
}
func IsCodeErr(errcode uint32) bool {
if _, ok := message[errcode]; ok {
return true
} else {
return false
}
}

39
pkg/helper/xerr/errors.go Normal file
View File

@ -0,0 +1,39 @@
package xerr
import (
"fmt"
)
/**
常用通用固定错误
*/
type CodeError struct {
errCode uint32
errMsg string
}
// 返回给前端的错误码
func (e *CodeError) GetErrCode() uint32 {
return e.errCode
}
// 返回给前端显示端错误信息
func (e *CodeError) GetErrMsg() string {
return e.errMsg
}
func (e *CodeError) Error() string {
return fmt.Sprintf("ErrCode:%d，ErrMsg:%s", e.errCode, e.errMsg)
}
func NewErrCodeMsg(errCode uint32, errMsg string) *CodeError {
return &CodeError{errCode: errCode, errMsg: errMsg}
}
func NewErrCode(errCode uint32) *CodeError {
return &CodeError{errCode: errCode, errMsg: MapErrMsg(errCode)}
}
func NewErrMsg(errMsg string) *CodeError {
return &CodeError{errCode: SERVER_COMMON_ERROR, errMsg: errMsg}
}

4
model/aiCenterModel.go → pkg/models/aiCenterModel.go
View File

@ -1,4 +1,4 @@
package model
package models
import (
"github.com/zeromicro/go-zero/core/stores/cache"
@ -19,7 +19,7 @@ type (
}
)
// NewAiCenterModel returns a model for the database table.
// NewAiCenterModel returns a models for the database table.
func NewAiCenterModel(conn sqlx.SqlConn, c cache.CacheConf) AiCenterModel {
return &customAiCenterModel{
defaultAiCenterModel: newAiCenterModel(conn, c),

2
model/aiCenterModel_gen.go → pkg/models/aiCenterModel_gen.go
View File

@ -1,6 +1,6 @@
// Code generated by goctl. DO NOT EDIT.
package model
package models
import (
"context"

2
model/aimodel.go → pkg/models/aimodel.go
View File

@ -1,4 +1,4 @@
package model
package models
type (
// AiModel is an interface to be customized, add more methods here,

2
model/aimodel_gen.go → pkg/models/aimodel_gen.go
View File

@ -1,6 +1,6 @@
// Code generated by goctl. DO NOT EDIT.
package model
package models
import (
"context"

4
model/centerOverViewModel.go → pkg/models/centerOverViewModel.go
View File

@ -1,4 +1,4 @@
package model
package models
import (
"github.com/zeromicro/go-zero/core/stores/cache"
@ -19,7 +19,7 @@ type (
}
)
// NewCenterOverviewModel returns a model for the database table.
// NewCenterOverviewModel returns a models for the database table.
func NewCenterOverviewModel(conn sqlx.SqlConn, c cache.CacheConf) CenterOverviewModel {
return &customCenterOverviewModel{
defaultCenterOverviewModel: newCenterOverviewModel(conn, c),

Some files were not shown because too many files have changed in this diff Show More