fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: filter cloudprovider/network by host-schedtag-id

Browse Source
This commit is contained in:
Qiu Jian
2020-09-27 17:57:54 +08:00
parent ea5fbef0c2
commit 82c0dcfb38
6 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/climc/shell/compute/cloudproviders.go
View File

@@ -35,6 +35,8 @@ func init() {
NoObjectStorage bool `help:"filter cloudproviders that has no object storage"`
Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
Cloudregion string `help:"filter cloudproviders by cloudregion"`
HostSchedtagId string `help:"filter by host schedtag"`
}
R(&CloudproviderListOptions{}, "cloud-provider-list", "List cloud providers", func(s *mcclient.ClientSession, args *CloudproviderListOptions) error {
var params *jsonutils.JSONDict
@@ -62,6 +64,10 @@ func init() {
if len(args.Cloudregion) > 0 {
params.Add(jsonutils.NewString(args.Cloudregion), "cloudregion")
}
if len(args.HostSchedtagId) > 0 {
params.Add(jsonutils.NewString(args.HostSchedtagId), "host_schedtag_id")
}
}
result, err := modules.Cloudproviders.List(s, params)
if err != nil {

3
pkg/apis/compute/cloudprovider.go
View File

@@ -232,6 +232,9 @@ type CloudproviderListInput struct {
// 账号健康状态
HealthStatus []string `json:"health_status"`
// filter by host schedtag
HostSchedtagId string `json:"host_schedtag_id"`
}
func (input *CapabilityListInput) AfterUnmarshal() {

3
pkg/apis/compute/network.go
View File

@@ -114,6 +114,9 @@ type NetworkListInput struct {
IsAutoAlloc *bool `json:"is_auto_alloc"`
// 是否为基础网络（underlay）
IsClassic *bool `json:"is_classic"`
// filter by Host schedtag
HostSchedtagId string `json:"host_schedtag_id"`
}
type NetworkResourceInfoBase struct {

16
pkg/compute/models/cloudproviders.go
View File

@@ -1201,6 +1201,22 @@ func (manager *SCloudproviderManager) ListItemFilter(
q = q.In("cloudaccount_id", subq)
}
if len(query.HostSchedtagId) > 0 {
schedTagObj, err := SchedtagManager.FetchByIdOrName(userCred, query.HostSchedtagId)
if err != nil {
if errors.Cause(err) == sql.ErrNoRows {
return nil, errors.Wrapf(httperrors.ErrResourceNotFound, "%s %s", SchedtagManager.Keyword(), query.HostSchedtagId)
} else {
return nil, errors.Wrap(err, "SchedtagManager.FetchByIdOrName")
}
}
subq := HostManager.Query("manager_id")
hostschedtags := HostschedtagManager.Query().Equals("schedtag_id", schedTagObj.GetId()).SubQuery()
subq = subq.Join(hostschedtags, sqlchemy.Equals(hostschedtags.Field("host_id"), subq.Field("id")))
log.Debugf("%s", subq.String())
q = q.In("id", subq.SubQuery())
}
return q, nil
}

15
pkg/compute/models/networks.go
View File

@@ -2010,6 +2010,21 @@ func (manager *SNetworkManager) ListItemFilter(
q = q.In("id", subq.SubQuery())
}
if len(input.HostSchedtagId) > 0 {
schedTagObj, err := SchedtagManager.FetchByIdOrName(userCred, input.HostSchedtagId)
if err != nil {
if errors.Cause(err) == sql.ErrNoRows {
return nil, errors.Wrapf(httperrors.ErrResourceNotFound, "%s %s", SchedtagManager.Keyword(), input.HostSchedtagId)
} else {
return nil, errors.Wrap(err, "SchedtagManager.FetchByIdOrName")
}
}
subq := HostwireManager.Query("wire_id")
hostschedtags := HostschedtagManager.Query().Equals("schedtag_id", schedTagObj.GetId()).SubQuery()
subq = subq.Join(hostschedtags, sqlchemy.Equals(hostschedtags.Field("host_id"), subq.Field("host_id")))
q = q.In("wire_id", subq.SubQuery())
}
return q, nil
}

2
pkg/mcclient/options/network.go
View File

@@ -34,6 +34,8 @@ type NetworkListOptions struct {
ServerType string `help:"search networks belongs to a ServerType" choices:"baremetal|container|eip|guest|ipmi|pxe"`
Schedtag string `help:"filter networks by schedtag"`
HostSchedtagId string `help:"filter by host schedtag"`
IsAutoAlloc *bool `help:"search network with is_auto_alloc"`
IsClassic *bool `help:"search classic on-premise network"`