From 1fc6c8b42ee0331436ad8d5abe3b8f0a6c30f5a8 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Wed, 15 Sep 2021 20:01:20 +0800 Subject: [PATCH] fix: climc event-show filter by resource name --- cmd/climc/shell/events/events.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/climc/shell/events/events.go b/cmd/climc/shell/events/events.go index 5e9991b76f..bef4292a64 100644 --- a/cmd/climc/shell/events/events.go +++ b/cmd/climc/shell/events/events.go @@ -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")