Skip to content

Commit c80f50f

Browse files
change to specific structure
Former-commit-id: 6fc004a
1 parent febe455 commit c80f50f

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

src/apimachinery/toposerver/inst/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type InstanceInterface interface {
4242
SelectInstsByAssociation(ctx context.Context, ownerID string, objID string, h http.Header, p *metadata.AssociationParams) (resp *metadata.SearchInstResult, err error)
4343
SelectInst(ctx context.Context, ownerID string, objID string, instID string, h http.Header, p *metadata.SearchParams) (resp *metadata.SearchInstResult, err error)
4444
SelectTopo(ctx context.Context, ownerID string, objID string, instID string, h http.Header, p *metadata.SearchParams) (resp *metadata.SearchInstResult, err error)
45-
SelectAssociationTopo(ctx context.Context, ownerID string, objID string, instID string, h http.Header, p *metadata.SearchParams) (resp *metadata.SearchInstResult, err error)
45+
SelectAssociationTopo(ctx context.Context, ownerID string, objID string, instID string, h http.Header, p *metadata.SearchParams) (resp *metadata.SearchAssociationTopoResult, err error)
4646
CreateModule(ctx context.Context, appID string, setID string, h http.Header, dat map[string]interface{}) (resp *metadata.CreateInstResult, err error)
4747
DeleteModule(ctx context.Context, appID string, setID string, moduleID string, h http.Header) (resp *metadata.Response, err error)
4848
UpdateModule(ctx context.Context, appID string, setID string, moduleID string, h http.Header, dat map[string]interface{}) (resp *metadata.Response, err error)

src/apimachinery/toposerver/inst/inst.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ func (t *instanceClient) SelectTopo(ctx context.Context, ownerID string, objID s
147147
return
148148
}
149149

150-
func (t *instanceClient) SelectAssociationTopo(ctx context.Context, ownerID string, objID string, instID string, h http.Header, p *metadata.SearchParams) (resp *metadata.SearchInstResult, err error) {
151-
resp = new(metadata.SearchInstResult)
150+
func (t *instanceClient) SelectAssociationTopo(ctx context.Context, ownerID string, objID string, instID string, h http.Header, p *metadata.SearchParams) (resp *metadata.SearchAssociationTopoResult, err error) {
151+
resp = new(metadata.SearchAssociationTopoResult)
152152
subPath := fmt.Sprintf("/inst/association/topo/search/owner/%s/object/%s/inst/%s", ownerID, objID, instID)
153153

154154
err = t.client.Post().

src/common/metadata/toposerver.go

+17
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,20 @@ type MainlineObjectTopoResult struct {
3535
BaseResp `json:",inline"`
3636
Data []MainlineObjectTopo `json:"data"`
3737
}
38+
39+
type CommonInstTopo struct {
40+
InstNameAsst
41+
Count int `json:"count"`
42+
Children []InstNameAsst `json:"children"`
43+
}
44+
45+
type CommonInstTopoV2 struct {
46+
Prev []*CommonInstTopo `json:"prev"`
47+
Next []*CommonInstTopo `json:"next"`
48+
Curr interface{} `json:"curr"`
49+
}
50+
51+
type SearchAssociationTopoResult struct {
52+
BaseResp `json:",inline"`
53+
Data []CommonInstTopoV2 `json:"data"`
54+
}

0 commit comments

Comments
 (0)