TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-09 03:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现删除集群

Browse Source
This commit is contained in:
刘祥超
2020-10-25 16:22:44 +08:00
parent 3a2d864b80
commit 022aa174a4
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/db/models/server_dao.go
View File

@@ -729,6 +729,14 @@ func (this *ServerDAO) FindAllEnabledServersWithWebIds(webIds []int64) (result [
return return
} }
// 计算使用某个集群的所有服务数量
func (this *ServerDAO) CountAllEnabledServersWithNodeClusterId(clusterId int64) (int64, error) {
return this.Query().
State(ServerStateEnabled).
Attr("clusterId", clusterId).
Count()
}
// 创建事件 // 创建事件
func (this *ServerDAO) createEvent() error { func (this *ServerDAO) createEvent() error {
return SharedSysEventDAO.CreateEvent(NewServerChangeEvent()) return SharedSysEventDAO.CreateEvent(NewServerChangeEvent())

4
internal/rpc/services/service_node_cluster.go
View File

@@ -46,7 +46,7 @@ func (this *NodeClusterService) UpdateNodeCluster(ctx context.Context, req *pb.U
} }
// 禁用集群 // 禁用集群
func (this *NodeClusterService) DisableNodeCluster(ctx context.Context, req *pb.DisableNodeClusterRequest) (*pb.DisableNodeClusterResponse, error) { func (this *NodeClusterService) DeleteNodeCluster(ctx context.Context, req *pb.DeleteNodeClusterRequest) (*pb.RPCDeleteSuccess, error) {
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin) _, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -57,7 +57,7 @@ func (this *NodeClusterService) DisableNodeCluster(ctx context.Context, req *pb.
return nil, err return nil, err
} }
return &pb.DisableNodeClusterResponse{}, nil return rpcutils.RPCDeleteSuccess()
} }
// 查找单个集群 // 查找单个集群

15
internal/rpc/services/service_server.go
View File

@@ -718,3 +718,18 @@ func (this *ServerService) CountAllEnabledServersWithHTTPFirewallPolicyId(ctx co
} }
return &pb.CountAllEnabledServersWithHTTPFirewallPolicyIdResponse{Count: countServers}, nil return &pb.CountAllEnabledServersWithHTTPFirewallPolicyIdResponse{Count: countServers}, nil
} }
// 计算运行在某个集群上的所有服务数量
func (this *ServerService) CountAllEnabledServersWithNodeClusterId(ctx context.Context, req *pb.CountAllEnabledServersWithNodeClusterIdRequest) (*pb.CountAllEnabledServersWithNodeClusterIdResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
count, err := models.SharedServerDAO.CountAllEnabledServersWithNodeClusterId(req.NodeClusterId)
if err != nil {
return nil, err
}
return &pb.CountAllEnabledServersWithNodeClusterIdResponse{Count: count}, nil
}