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

Merge pull request #12229 from swordqiu/automated-cherry-pick-of-#12228-upstream-release-3.8

Browse Source 
Automated cherry pick of #12228: fix: climc event-show filter by resource name
This commit is contained in:
Zexi Li
2021-09-15 22:17:27 +08:00
committed by GitHub
parent 5a55a17967 1fc6c8b42e
commit 5e787456b7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/events/events.go
+7 -3
View File
@@ -44,13 +44,14 @@ type BaseEventListOptions struct {
type EventListOptions struct {
BaseEventListOptions
Id string `help:"" metavar:"OBJ_ID"`
Id []string `help:"object IDs" metavar:"OBJ_ID"`
Name []string `help:"object names" metavar:"OBJ_NAME"`
Type []string `help:"Type of relevant object" metavar:"OBJ_TYPE"`
}
type TypeEventListOptions struct {
BaseEventListOptions
ID string `help:"" metavar:"OBJ_ID"`
ID []string `help:"object IDs" metavar:"OBJ_ID"`
}
func doComputeEventList(s *mcclient.ClientSession, args *EventListOptions) error {
@@ -71,7 +72,10 @@ func DoEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args
params.Add(jsonutils.NewStringArray(args.Type), "obj_type")
}
if len(args.Id) > 0 {
params.Add(jsonutils.NewString(args.Id), "obj_id")
params.Add(jsonutils.NewStringArray(args.Id), "obj_id")
}
if len(args.Name) > 0 {
params.Add(jsonutils.NewStringArray(args.Name), "obj_name")
}
if len(args.Since) > 0 {
params.Add(jsonutils.NewString(args.Since), "since")