fix(climc): add scope parameter to pod-exec (#20151)

yunionio · Apr 28, 2024 · 0169988 · 0169988
1 parent 360231b
commit 0169988
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmd/climc/shell/compute/server_pod.go b/cmd/climc/shell/compute/server_pod.go
@@ -43,9 +43,13 @@ func init() {
 	})
 
 	R(&options.PodExecOptions{}, "pod-exec", "Execute a command in a container", func(s *mcclient.ClientSession, opt *options.PodExecOptions) error {
-		ctrs, err := modules.Containers.List(s, jsonutils.Marshal(map[string]string{
+		listOpt := map[string]string{
 			"guest_id": opt.ID,
-		}))
+		}
+		if len(opt.Scope) != 0 {
+			listOpt["scope"] = opt.Scope
+		}
+		ctrs, err := modules.Containers.List(s, jsonutils.Marshal(listOpt))
 		if err != nil {
 			return errors.Wrapf(err, "list containers by guest_id %s", opt.ID)
 		}

diff --git a/pkg/mcclient/options/compute/server_pod.go b/pkg/mcclient/options/compute/server_pod.go
@@ -239,5 +239,6 @@ func (o *PodCreateOptions) Params() (*computeapi.ServerCreateInput, error) {
 
 type PodExecOptions struct {
 	ContainerExecOptions
+	Scope     string `help:"Scope of containers query" choices:"system|domain|project"`
 	Container string `help:"Container name. If omitted, use the first container." short-token:"c"`
 }