floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除ceph 

Former-commit-id: 064ce4fba3268c9caa2a73b6fc9092a3da79340b
This commit is contained in:
zhangwei 2024-10-22 21:18:03 +08:00
parent 791fe7bcf3
commit a1b3aa4ba6
6 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desc/core/pcm-core.api
View File

@ -898,7 +898,7 @@ type (
RegionDict string `json:"regionDict,omitempty" db:"region_dict"` RegionDict string `json:"regionDict,omitempty" db:"region_dict"`
Location string `json:"location,omitempty" db:"location"` Location string `json:"location,omitempty" db:"location"`
CreateTime string `json:"createTime,omitempty" db:"created_time" gorm:"autoCreateTime"` CreateTime string `json:"createTime,omitempty" db:"created_time" gorm:"autoCreateTime"`
Environment map[string]string `json:"environment,omitempty" db:"environment"` Environment string `json:"environment,omitempty" db:"environment"`
} }
) )

4
desc/pcm.api
View File

@ -400,10 +400,6 @@ service pcm {
group: storage group: storage
) )
service pcm { service pcm {
@doc "存储概览"
@handler screenStorageHandler
get /storage/screenStorage (StorageScreenReq) returns (StorageScreenResp)
@doc "日常算力查询" @doc "日常算力查询"
@handler dailyPowerScreenHandler @handler dailyPowerScreenHandler
get /storage/dailyPowerScreen returns (DailyPowerScreenResp) get /storage/dailyPowerScreen returns (DailyPowerScreenResp)

5
internal/handler/routes.go
View File

@ -473,11 +473,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
server.AddRoutes( server.AddRoutes(
[]rest.Route{ []rest.Route{
{
Method: http.MethodGet,
Path: "/storage/screenStorage",
Handler: storage.ScreenStorageHandler(serverCtx),
},
{ {
Method: http.MethodGet, Method: http.MethodGet,
Path: "/storage/dailyPowerScreen", Path: "/storage/dailyPowerScreen",

24
internal/handler/storage/screenstoragehandler.go
View File

@ -1,24 +0,0 @@
package storage
import (
"github.com/zeromicro/go-zero/rest/httpx"
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/logic/storage"
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/svc"
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/types"
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
"net/http"
)
func ScreenStorageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.StorageScreenReq
if err := httpx.Parse(r, &req); err != nil {
result.ParamErrorResult(r, w, err)
return
}
l := storage.NewScreenStorageLogic(r.Context(), svcCtx)
resp, err := l.ScreenStorage(&req)
result.HttpResult(r, w, resp, err)
}
}

2
internal/logic/core/getclusterbyidlogic.go
View File

@ -26,7 +26,7 @@ func NewGetClusterByIdLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
func (l *GetClusterByIdLogic) GetClusterById(req *types.GetClusterByIdReq) (resp *types.GetClusterByIdResp, err error) { func (l *GetClusterByIdLogic) GetClusterById(req *types.GetClusterByIdReq) (resp *types.GetClusterByIdResp, err error) {
resp = &types.GetClusterByIdResp{} resp = &types.GetClusterByIdResp{}
tx := l.svcCtx.DbEngin.Raw("select * from t_cluster where id = ?", req.ClusterId).Scan(&resp) tx := l.svcCtx.DbEngin.Raw("select * from t_cluster where id = ?", req.ClusterId).Scan(&resp.ClusterInfo)
if tx.Error != nil { if tx.Error != nil {
logx.Errorf(tx.Error.Error()) logx.Errorf(tx.Error.Error())
return nil, errors.New("cluster create failed") return nil, errors.New("cluster create failed")

46
internal/types/types.go
View File

@ -812,29 +812,29 @@ type ClusterCreateReq struct {
} }
type ClusterInfo struct { type ClusterInfo struct {
Id string `json:"id,omitempty" db:"id"` Id string `json:"id,omitempty" db:"id"`
AdapterId string `json:"adapterId,omitempty" db:"adapter_id"` AdapterId string `json:"adapterId,omitempty" db:"adapter_id"`
Name string `json:"name,omitempty" db:"name"` Name string `json:"name,omitempty" db:"name"`
Nickname string `json:"nickname,omitempty" db:"nickname"` Nickname string `json:"nickname,omitempty" db:"nickname"`
Description string `json:"description,omitempty" db:"description"` Description string `json:"description,omitempty" db:"description"`
Server string `json:"server,omitempty" db:"server"` Server string `json:"server,omitempty" db:"server"`
MonitorServer string `json:"monitorServer,omitempty" db:"monitor_server"` MonitorServer string `json:"monitorServer,omitempty" db:"monitor_server"`
Username string `json:"username,omitempty" db:"username"` Username string `json:"username,omitempty" db:"username"`
Password string `json:"password,omitempty" db:"password"` Password string `json:"password,omitempty" db:"password"`
Token string `json:"token,omitempty" db:"token"` Token string `json:"token,omitempty" db:"token"`
Ak string `json:"ak,omitempty" db:"ak"` Ak string `json:"ak,omitempty" db:"ak"`
Sk string `json:"sk,omitempty" db:"sk"` Sk string `json:"sk,omitempty" db:"sk"`
Region string `json:"region,omitempty" db:"region"` Region string `json:"region,omitempty" db:"region"`
ProjectId string `json:"projectId,omitempty" db:"project_id"` ProjectId string `json:"projectId,omitempty" db:"project_id"`
Version string `json:"version,omitempty" db:"version"` Version string `json:"version,omitempty" db:"version"`
Label string `json:"label,omitempty" db:"label"` Label string `json:"label,omitempty" db:"label"`
OwnerId string `json:"ownerId,omitempty" db:"owner_id"` OwnerId string `json:"ownerId,omitempty" db:"owner_id"`
AuthType string `json:"authType,omitempty" db:"auth_type"` AuthType string `json:"authType,omitempty" db:"auth_type"`
ProducerDict string `json:"producerDict,omitempty" db:"producer_dict"` ProducerDict string `json:"producerDict,omitempty" db:"producer_dict"`
RegionDict string `json:"regionDict,omitempty" db:"region_dict"` RegionDict string `json:"regionDict,omitempty" db:"region_dict"`
Location string `json:"location,omitempty" db:"location"` Location string `json:"location,omitempty" db:"location"`
CreateTime string `json:"createTime,omitempty" db:"created_time" gorm:"autoCreateTime"` CreateTime string `json:"createTime,omitempty" db:"created_time" gorm:"autoCreateTime"`
Environment map[string]string `json:"environment,omitempty" db:"environment"` Environment string `json:"environment,omitempty" db:"environment"`
} }
type ClusterDelReq struct { type ClusterDelReq struct {