🐛 Fixing a bug.

Signed-off-by: devad <cossjie@foxmail.com>

Former-commit-id: cd070699d1419d91e70ea3fde4c2c2a022aac811
This commit is contained in:
devad 2023-11-23 20:14:58 +08:00
parent 3a999dc5d8
commit 36ae5ad124
6 changed files with 609 additions and 574 deletions

View File

@ -27,22 +27,6 @@ type (
MetricsUrl string `json:"metricsUrl"` //监控url
}
ListParticipantResp {
Code string `json:"code"`
Msg string `json:"msg"`
Data []ParticipantResp `json:"data"`
}
ParticipantResp {
Id int64 `json:"id"` // id
Name string `json:"name"` // 名称
Address string `json:"address"` // 地址
token string `json:"token"` // 数算集群token
Type string `json:"type"` // 参与者类型:CLOUD-数算集群;AI-智算集群HPC-超算集群
ParticipantId int64 `json:"name"` // participant id
MetricsUrl string `json:"metricsUrl"` //监控url
}
CloudResp {
Code string `json:"code"`
Msg string `json:"msg"`

View File

@ -154,10 +154,6 @@ service pcm {
@handler deleteClusterHandler
post /cloud/deleteCluster (RegisterClusterReq) returns (CloudResp)
@doc "数算集群信息查询"
@handler listCloudClusterHandler
get /cloud/listCluster returns (ListParticipantResp)
@doc "触发租户更新"
@handler noticeTenantHandler
get /cloud/noticeTenant returns (CloudResp)

View File

@ -0,0 +1,44 @@
package cloud
import (
"context"
"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/api/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
"github.com/zeromicro/go-zero/core/logx"
)
type UpdateTenantLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewUpdateTenantLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateTenantLogic {
return &UpdateTenantLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
// UpdateTenant 更新租户数据
func (l *UpdateTenantLogic) UpdateTenant(req *types.UpdateTenantReq) (resp *types.CloudResp, err error) {
//先删除所有租户数据
l.svcCtx.DbEngin.Where("type = 0").Delete(models.ScTenantInfo{})
var tenants []*models.ScTenantInfo
for _, t := range req.Tenants {
tenants = append(tenants, &models.ScTenantInfo{
Id: utils.GenSnowflakeID(),
TenantName: t.TenantName,
Clusters: t.Clusters,
Type: 0,
})
}
//再插入新的租户数据
l.svcCtx.DbEngin.Save(&tenants)
return
}

View File

@ -171,6 +171,7 @@ message ParticipantPhyReq {
int64 id = 17; // id
string MetricsUrl = 18; //url
string RpcAddress = 19;
string Token = 20; //token
}
// NodePhyInfo

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.3.0
// - protoc v3.19.4
// source: pcmCore.proto
// - protoc v4.25.0
// source: pb/pcmCore.proto
package pcmCore
@ -146,7 +146,7 @@ var PcmCore_ServiceDesc = grpc.ServiceDesc{
},
},
Streams: []grpc.StreamDesc{},
Metadata: "pcmCore.proto",
Metadata: "pb/pcmCore.proto",
}
const (
@ -511,5 +511,5 @@ var ParticipantService_ServiceDesc = grpc.ServiceDesc{
},
},
Streams: []grpc.StreamDesc{},
Metadata: "pcmCore.proto",
Metadata: "pb/pcmCore.proto",
}