Skip to content

Commit

Permalink
补充测试用例hostserver
Browse files Browse the repository at this point in the history 
--story=121591642
  • Loading branch information
@bd-xiaowang
bd-xiaowang committed Jan 20, 2025
1 parent 2e708d9 commit 7b2f116
Show file tree
Hide file tree
Showing 8 changed files with 2,304 additions and 30 deletions.
496 changes: 482 additions & 14 deletions src/apimachinery/hostserver/apis.go
View file

Large diffs are not rendered by default.

58 changes: 49 additions & 9 deletions src/apimachinery/hostserver/hostserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,23 @@ type HostServerClientInterface interface {
SearchHostWithBiz(ctx context.Context, h http.Header, dat *metadata.HostCommonSearch) (
resp *metadata.SearchHostResult, err error)
SearchHostWithAsstDetail(ctx context.Context, h http.Header, dat *metadata.HostCommonSearch) (resp *metadata.
SearchHostResult, err error)
SearchHostResult, err error)
UpdateHostBatch(ctx context.Context, h http.Header, dat interface{}) (resp *metadata.Response, err error)
UpdateHostPropertyBatch(ctx context.Context, h http.Header, data map[string]interface{}) errors.CCErrorCoder

// CreateDynamicGroup TODO
// dynamic group interfaces.
CreateDynamicGroup(ctx context.Context, header http.Header, data map[string]interface{}) (resp *metadata.IDResult,
CreateDynamicGroup(ctx context.Context, header http.Header, data *metadata.DynamicGroup) (resp *metadata.IDResult,
err error)
UpdateDynamicGroup(ctx context.Context, bizID, id string, header http.Header,
data map[string]interface{}) (resp *metadata.BaseResp, err error)
DeleteDynamicGroup(ctx context.Context, bizID, id string, header http.Header) (resp *metadata.BaseResp, err error)
GetDynamicGroup(ctx context.Context, bizID, id string, header http.Header) (resp *metadata.GetDynamicGroupResult,
UpdateDynamicGroup(ctx context.Context, bizID int64, id string, header http.Header,
data *metadata.DynamicGroup) (resp *metadata.BaseResp, err error)
DeleteDynamicGroup(ctx context.Context, bizID int64, id string, header http.Header) (resp *metadata.BaseResp, err error)
GetDynamicGroup(ctx context.Context, bizID int64, id string, header http.Header) (resp *metadata.GetDynamicGroupResult,
err error)
SearchDynamicGroup(ctx context.Context, bizID string, header http.Header,
SearchDynamicGroup(ctx context.Context, bizID int64, header http.Header,
data *metadata.QueryCondition) (resp *metadata.SearchDynamicGroupResult, err error)
ExecuteDynamicGroup(ctx context.Context, bizID, id string, header http.Header,
data map[string]interface{}) (resp *metadata.Response, err error)
ExecuteDynamicGroup(ctx context.Context, bizID int64, id string, header http.Header,
data *metadata.ExecuteOption) (resp *metadata.ResponseInstData, err error)

HostSearch(ctx context.Context, h http.Header, params *metadata.HostCommonSearch) (resp *metadata.QueryInstResult,
err error)
Expand Down Expand Up @@ -120,6 +120,46 @@ type HostServerClientInterface interface {
*metadata.RspIDs, errors.CCErrorCoder)
DeleteCloudHostFromBiz(ctx context.Context, header http.Header,
option *metadata.DeleteCloudHostFromBizParam) errors.CCErrorCoder

AddHostToBizIdle(ctx context.Context, header http.Header, option *metadata.HostListParam) (
*metadata.HostIDsResp, errors.CCErrorCoder)
CountBizHostCPU(ctx context.Context, header http.Header, option *metadata.CountHostCPUReq) (
*metadata.BizHostCpuCount, errors.CCErrorCoder)
UpdateHostsAllProperty(ctx context.Context, header http.Header,
option *metadata.UpdateHostOpt) errors.CCErrorCoder

FindModuleHostRelation(ctx context.Context, header http.Header, bizID int64,
option *metadata.FindModuleHostRelationParameter) (*metadata.FindModuleHostRelationResult, errors.CCErrorCoder)
FindHostByServiceTmpl(ctx context.Context, header http.Header, bizID int64,
option *metadata.FindHostsBySrvTplOpt) (*metadata.SearchHost, errors.CCErrorCoder)
FindHostBySetTmpl(ctx context.Context, header http.Header, bizID int64,
option *metadata.FindHostsBySetTplOpt) (*metadata.SearchHost, errors.CCErrorCoder)
ListResourcePoolHosts(ctx context.Context, header http.Header,
option *metadata.ListHostsParameter) (*metadata.ListHostResult, errors.CCErrorCoder)
ListHostsWithoutApp(ctx context.Context, header http.Header,
option *metadata.ListHostsWithNoBizParameter) (*metadata.ListHostResult, errors.CCErrorCoder)

FindHostByTopoInst(ctx context.Context, header http.Header, bizID int64,
option *metadata.FindHostsByTopoOpt) (*metadata.SearchHost, errors.CCErrorCoder)
FindHostDetailTopo(ctx context.Context, header http.Header,
option *metadata.ListHostsDetailAndTopoOption) (*metadata.HostMainlineTopoResult, errors.CCErrorCoder)
FindHostRelationWithTopo(ctx context.Context, header http.Header,
option *metadata.FindHostRelationWtihTopoOpt) (*metadata.HostConfigData, errors.CCErrorCoder)
FindHostServiceTmpl(ctx context.Context, header http.Header, option *metadata.HostIDReq) (
*metadata.HostSrvTmplResp, errors.CCErrorCoder)
FindHostTotalMainlineTopo(ctx context.Context, header http.Header, bizID int64,
option *metadata.FindHostTotalTopo) (*metadata.HostMainlineTopoResult, errors.CCErrorCoder)

UpdateHostCloudArea(ctx context.Context, header http.Header,
option *metadata.UpdateHostCloudAreaFieldOption) errors.CCErrorCoder
UpdateHostToRecycle(ctx context.Context, header http.Header,
option *metadata.DefaultModuleHostConfigParams) errors.CCErrorCoder
FindHostModules(ctx context.Context, header http.Header,
option *metadata.HostModuleRelationParameter) (*metadata.HostModuleResp, errors.CCErrorCoder)
FindHostTopoRelation(ctx context.Context, header http.Header,
option *metadata.HostModuleRelationRequest) (*metadata.HostConfigData, errors.CCErrorCoder)
TransferHostResourceDirectory(ctx context.Context, header http.Header,
option *metadata.TransferHostResourceDirectory) errors.CCErrorCoder
}

// NewHostServerClientInterface TODO
Expand Down
39 changes: 37 additions & 2 deletions src/common/metadata/hostserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1060,8 +1060,14 @@ func (f *FindHostTotalTopo) Validate(errProxy errors.DefaultCCErrorIf) errors.CC

// HostMainlineTopoResult result of host mainline topo
type HostMainlineTopoResult struct {
Count int `json:"count"`
Info []HostDetailWithTopo `json:"info"`
Count int `json:"count"`
Info []*HostDetailWithTopo `json:"info"`
}

// HostMainlineTopoResp response of host mainline topo
type HostMainlineTopoResp struct {
BaseResp `json:",inline"`
Data *HostMainlineTopoResult `json:"data"`
}

// Validate validate hostIDs length
Expand Down Expand Up @@ -1204,6 +1210,12 @@ type HostIDsResp struct {
HostIDs []int64 `json:"bk_host_ids"`
}

// CreateHostBatchResult create host batch result
type CreateHostBatchResult struct {
BaseResp `json:",inline"`
Data HostIDsResp `json:"data"`
}

// CountHostCPUReq count host cpu num request
type CountHostCPUReq struct {
BizID int64 `json:"bk_biz_id,omitempty"`
Expand Down Expand Up @@ -1247,6 +1259,12 @@ type BizHostCpuCount struct {
NoCpuHostCount int64 `json:"no_cpu_host_count"`
}

// BizHostCpuCountResult host cpu count in biz result
type BizHostCpuCountResult struct {
BaseResp `json:",inline"`
Data []BizHostCpuCount `json:"data"`
}

// AddCloudHostToBizParam add cloud host to biz idle module request parameter
type AddCloudHostToBizParam struct {
BizID int64 `json:"bk_biz_id"`
Expand Down Expand Up @@ -1334,3 +1352,20 @@ func (u *UpdateHostOpt) Validate() errors.RawErrorInfo {

return errors.RawErrorInfo{}
}

// HostIDReq host id request
type HostIDReq struct {
HostIDs []int64 `json:"bk_host_id"`
}

// HostSrvTmplResult find host service template result
type HostSrvTmplResult struct {
HostID int64 `json:",bk_host_id"`
SrvTmplIDs []int64 `json:"service_template_id"`
}

// HostSrvTmplResp find host service template response
type HostSrvTmplResp struct {
BaseResp `json:",inline"`
Data []HostSrvTmplResult `json:"data"`
}
8 changes: 3 additions & 5 deletions src/scene_server/host_server/service/findhost.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1049,20 +1049,18 @@ func (s *Service) countTopoNodeHosts(ctx *rest.Contexts, bizID int64,
// ListServiceTemplateIDsByHost list service template id one by one about hostID
func (s *Service) ListServiceTemplateIDsByHost(ctx *rest.Contexts) {

input := struct {
ID []int64 `json:"bk_host_id"`
}{}
input := meta.HostIDReq{}
if err := ctx.DecodeInto(&input); err != nil {
ctx.RespAutoError(err)
return
}

if len(input.ID) > 200 {
if len(input.HostIDs) > 200 {
ctx.RespAutoError(ctx.Kit.CCError.CCErrorf(common.CCErrCommValExceedMaxFailed, common.BKHostIDField, 200))
return
}

rsp, err := s.Logic.ListServiceTemplateHostIDMap(ctx.Kit, input.ID)
rsp, err := s.Logic.ListServiceTemplateHostIDMap(ctx.Kit, input.HostIDs)
if err != nil {
ctx.RespAutoError(err)
return
Expand Down
Loading

0 comments on commit 7b2f116

Please sign in to comment.