From 66ed638d356ff1ee4455de1faed3d3165ec9d4cc Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Tue, 5 Jul 2022 17:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/grampus/grampus.go | 20 ++++++++++---------- routers/repo/grampus.go | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/grampus/grampus.go b/modules/grampus/grampus.go index e6892dd83..caaae4e8e 100755 --- a/modules/grampus/grampus.go +++ b/modules/grampus/grampus.go @@ -73,7 +73,7 @@ type GenerateTrainJobReq struct { func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error) { createTime := timeutil.TimeStampNow() - CenterID, CenterName := getCentersParamter(ctx, req) + centerID, centerName := getCentersParamter(ctx, req) jobResult, err := createJob(models.CreateGrampusJobRequest{ Name: req.JobName, @@ -84,8 +84,8 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error ResourceSpecId: req.ResourceSpecId, ImageId: req.ImageId, ImageUrl: req.ImageUrl, - CenterID: CenterID, - CenterName: CenterName, + CenterID: centerID, + CenterName: centerName, ReplicaNum: 1, }, }, @@ -144,8 +144,8 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error } func getCentersParamter(ctx *context.Context, req *GenerateTrainJobReq) ([]string, []string) { - var CenterID []string - var CenterName []string + var centerID []string + var centerName []string includeCenters := make(map[string]string) excludeCenters := make(map[string]string) @@ -174,8 +174,8 @@ func getCentersParamter(ctx *context.Context, req *GenerateTrainJobReq) ([]strin if len(includeCenters) > 0 { //如果有专属资源池,根据专属资源池指定智算中心 for k, v := range includeCenters { - CenterID = append(CenterID, k) - CenterName = append(CenterName, v) + centerID = append(centerID, k) + centerName = append(centerName, v) } } else if len(excludeCenters) > 0 { //否则,有要排除的中心,先获取所有中心,删除其中的排除中心,得到指定的智算中心 @@ -195,12 +195,12 @@ func getCentersParamter(ctx *context.Context, req *GenerateTrainJobReq) ([]strin } for k, v := range allCenters { - CenterID = append(CenterID, k) - CenterName = append(CenterName, v) + centerID = append(centerID, k) + centerName = append(centerName, v) } } - return CenterID, CenterName + return centerID, centerName } func TransTrainJobStatus(status string) string { diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index c7763b745..92142fb2c 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -105,12 +105,12 @@ func grampusTrainJobNewDataPrepare(ctx *context.Context, processType string) err //get valid resource specs specs, err := grampus.GetResourceSpecs(processType) - GrampusSpecs := getFilterSpecBySpecialPool(specs, includeCenters, excludeCenters) + grampusSpecs := getFilterSpecBySpecialPool(specs, includeCenters, excludeCenters) if err != nil { log.Error("GetResourceSpecs failed:", err.Error()) } else { - ctx.Data["flavor_infos"] = GrampusSpecs + ctx.Data["flavor_infos"] = grampusSpecs } //get branches @@ -136,14 +136,14 @@ func getFilterSpecBySpecialPool(specs *models.GetGrampusResourceSpecsResult, inc if len(includeCenters) == 0 && len(excludeCenters) == 0 { return specs.Infos } - var GrampusSpecs []models.GrampusSpec + var grampusSpecs []models.GrampusSpec for _, info := range specs.Infos { if isInIncludeCenters(info, includeCenters) || (len(excludeCenters) != 0 && isNotAllInExcludeCenters(info, excludeCenters)) { - GrampusSpecs = append(GrampusSpecs, info) + grampusSpecs = append(grampusSpecs, info) } } - return GrampusSpecs + return grampusSpecs } func isInIncludeCenters(grampusSpec models.GrampusSpec, centers map[string]struct{}) bool {