opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

不同类型的tag使用对应的参数进行过滤

Browse Source
This commit is contained in:
ioito
2019-05-20 20:10:37 +08:00
parent 06e895da09
commit e553d43606
1 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/options/base.go
+37 -16
View File
@@ -19,7 +19,6 @@ import (
"reflect"
"strings"
"time"
"unicode"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/gotypes"
@@ -202,7 +201,9 @@ type BaseListOptions struct {
ExportFile string `help:"Export to file" metavar:"<EXPORT_FILE_PATH>" json:"-"`
ExportKeys string `help:"Export field keys"`
ExportTexts string `help:"Export field displayname texts" json:"-"`
Tags []string `help:"Tags info, eg: hypervisor=aliyun、os_type=Linux、os_version"`
Tags []string `help:"Tags info, eg: hypervisor=aliyun, os_type=Linux, os_version" json:"-"`
UserTags []string `help:"UserTags info, eg: group=rd" json:"-"`
CloudTags []string `help:"CloudTags info, eg: price_key=cn-beijing" json:"-"`
Manager string `help:"List objects belonging to the cloud provider" json:"manager,omitempty"`
Account string `help:"List objects belonging to the cloud account" json:"account,omitempty"`
@@ -214,6 +215,22 @@ type BaseListOptions struct {
IsManaged *bool `help:"List objects managed by external providers" token:"managed" json:"is_managed"`
}
func (opts *BaseListOptions) addTag(prefix, tag string, idx int, params *jsonutils.JSONDict) error {
tagInfo := strings.Split(tag, "=")
if len(tagInfo) > 2 {
return fmt.Errorf("Too many equal characters %s", tag)
}
key := tagInfo[0]
if len(key) == 0 {
return fmt.Errorf("Key must not be empty")
}
params.Add(jsonutils.NewString(prefix+key), fmt.Sprintf("tags.%d.key", idx))
if len(tagInfo) == 2 {
params.Add(jsonutils.NewString(tagInfo[1]), fmt.Sprintf("tags.%d.value", idx))
}
return nil
}
func (opts *BaseListOptions) Params() (*jsonutils.JSONDict, error) {
params, err := optionsStructToParams(opts)
if err != nil {
@@ -235,23 +252,27 @@ func (opts *BaseListOptions) Params() (*jsonutils.JSONDict, error) {
params.Set("admin", jsonutils.JSONTrue)
}
}
for idx, tag := range opts.Tags {
tagInfo := strings.Split(tag, "=")
if len(tagInfo) > 2 {
return nil, fmt.Errorf("failed parse tags info %s", tag)
tagIdx := 0
for _, tag := range opts.Tags {
err = opts.addTag("", tag, tagIdx, params)
if err != nil {
return nil, err
}
if len(tagInfo[0]) == 0 {
return nil, fmt.Errorf("Not support empty key")
tagIdx++
}
for _, tag := range opts.UserTags {
err = opts.addTag("user:", tag, tagIdx, params)
if err != nil {
return nil, err
}
for _, k := range tagInfo[0] {
if k != rune('_') && !unicode.IsLetter(k) && !unicode.IsDigit(k) {
return nil, fmt.Errorf("Not support tag key with %s", string(k))
}
}
params.Add(jsonutils.NewString(tagInfo[0]), fmt.Sprintf("tags.%d.key", idx))
if len(tagInfo) == 2 {
params.Add(jsonutils.NewString(tagInfo[1]), fmt.Sprintf("tags.%d.value", idx))
tagIdx++
}
for _, tag := range opts.CloudTags {
err = opts.addTag("ext:", tag, tagIdx, params)
if err != nil {
return nil, err
}
tagIdx++
}
return params, nil
}