2 files changed, 134 insertions, 10 deletions

diff --git a/cmd/podmanV2/containers/inspect.go b/cmd/podmanV2/containers/inspect.go
index 635be4789..648289f0b 100644
--- a/cmd/podmanV2/containers/inspect.go
+++ b/cmd/podmanV2/containers/inspect.go
@@ -1,8 +1,15 @@
 package containers
 
 import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+	"text/template"
+
 	"github.com/containers/libpod/cmd/podmanV2/registry"
 	"github.com/containers/libpod/pkg/domain/entities"
+	jsoniter "github.com/json-iterator/go"
 	"github.com/spf13/cobra"
 )
 
@@ -12,31 +19,57 @@ var (
 		Use:     "inspect [flags] CONTAINER",
 		Short:   "Display the configuration of a container",
 		Long:    `Displays the low-level information on a container identified by name or ID.`,
-		PreRunE: inspectPreRunE,
+		PreRunE: preRunE,
 		RunE:    inspect,
 		Example: `podman container inspect myCtr
   podman container inspect -l --format '{{.Id}} {{.Config.Labels}}'`,
 	}
 )
 
+var (
+	inspectOptions entities.ContainerInspectOptions
+)
+
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
 		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: inspectCmd,
 		Parent:  containerCmd,
 	})
-}
-
-func inspectPreRunE(cmd *cobra.Command, args []string) (err error) {
-	err = preRunE(cmd, args)
-	if err != nil {
-		return
+	flags := inspectCmd.Flags()
+	flags.StringVarP(&inspectOptions.Format, "format", "f", "", "Change the output format to a Go template")
+	flags.BoolVarP(&inspectOptions.Latest, "latest", "l", false, "Act on the latest container podman is aware of")
+	flags.BoolVarP(&inspectOptions.Size, "size", "s", false, "Display total file size")
+	if registry.IsRemote() {
+		_ = flags.MarkHidden("latest")
 	}
-
-	_, err = registry.NewImageEngine(cmd, args)
-	return err
 }
 
 func inspect(cmd *cobra.Command, args []string) error {
+	responses, err := registry.ContainerEngine().ContainerInspect(context.Background(), args, inspectOptions)
+	if err != nil {
+		return err
+	}
+	if inspectOptions.Format == "" {
+		b, err := jsoniter.MarshalIndent(responses, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(b))
+		return nil
+	}
+	format := inspectOptions.Format
+	if !strings.HasSuffix(format, "\n") {
+		format += "\n"
+	}
+	tmpl, err := template.New("inspect").Parse(format)
+	if err != nil {
+		return err
+	}
+	for _, i := range responses {
+		if err := tmpl.Execute(os.Stdout, i); err != nil {
+			return err
+		}
+	}
 	return nil
 }
diff --git a/cmd/podmanV2/containers/top.go b/cmd/podmanV2/containers/top.go
new file mode 100644
index 000000000..a86c12e2a
--- /dev/null
+++ b/cmd/podmanV2/containers/top.go
@@ -0,0 +1,91 @@
+package containers
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/containers/libpod/cmd/podmanV2/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/psgo"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	topDescription = fmt.Sprintf(`Similar to system "top" command.
+
+  Specify format descriptors to alter the output.
+
+  Running "podman top -l pid pcpu seccomp" will print the process ID, the CPU percentage and the seccomp mode of each process of the latest container.
+  Format Descriptors:
+    %s`, strings.Join(psgo.ListDescriptors(), ","))
+
+	topOptions = entities.TopOptions{}
+
+	topCommand = &cobra.Command{
+		Use:               "top [flags] CONTAINER [FORMAT-DESCRIPTORS|ARGS]",
+		Short:             "Display the running processes of a container",
+		Long:              topDescription,
+		PersistentPreRunE: preRunE,
+		RunE:              top,
+		Args:              cobra.ArbitraryArgs,
+		Example: `podman top ctrID
+podman top --latest
+podman top ctrID pid seccomp args %C
+podman top ctrID -eo user,pid,comm`,
+	}
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: topCommand,
+	})
+
+	topCommand.SetHelpTemplate(registry.HelpTemplate())
+	topCommand.SetUsageTemplate(registry.UsageTemplate())
+
+	flags := topCommand.Flags()
+	flags.SetInterspersed(false)
+	flags.BoolVar(&topOptions.ListDescriptors, "list-descriptors", false, "")
+	flags.BoolVarP(&topOptions.Latest, "latest", "l", false, "Act on the latest container podman is aware of")
+
+	_ = flags.MarkHidden("list-descriptors") // meant only for bash completion
+	if registry.IsRemote() {
+		_ = flags.MarkHidden("latest")
+	}
+}
+
+func top(cmd *cobra.Command, args []string) error {
+	if topOptions.ListDescriptors {
+		fmt.Println(strings.Join(psgo.ListDescriptors(), "\n"))
+		return nil
+	}
+
+	if len(args) < 1 && !topOptions.Latest {
+		return errors.Errorf("you must provide the name or id of a running container")
+	}
+
+	if topOptions.Latest {
+		topOptions.Descriptors = args
+	} else {
+		topOptions.NameOrID = args[0]
+		topOptions.Descriptors = args[1:]
+	}
+
+	topResponse, err := registry.ContainerEngine().ContainerTop(context.Background(), topOptions)
+	if err != nil {
+		return err
+	}
+
+	w := tabwriter.NewWriter(os.Stdout, 5, 1, 3, ' ', 0)
+	for _, proc := range topResponse.Value {
+		if _, err := fmt.Fprintln(w, proc); err != nil {
+			return err
+		}
+	}
+	return w.Flush()
+}