1 files changed, 28 insertions, 26 deletions
diff --git a/cmd/podman/pod_stop.go b/cmd/podman/pod_stop.go
index 148b4d518..63bd0f5cb 100644
--- a/cmd/podman/pod_stop.go
+++ b/cmd/podman/pod_stop.go
@@ -2,48 +2,50 @@ package main
 
 import (
 	"fmt"
+
+	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/spf13/cobra"
 )
 
 var (
-	podStopFlags = []cli.Flag{
-		cli.BoolFlag{
-			Name:  "all, a",
-			Usage: "Stop all running pods",
-		},
-		LatestPodFlag,
-		cli.UintFlag{
-			Name:  "timeout, time, t",
-			Usage: "Seconds to wait for pod stop before killing the container",
-		},
-	}
+	podStopCommand     cliconfig.PodStopValues
 	podStopDescription = `
    podman pod stop
 
    Stops one or more running pods.  The pod name or ID can be used.
 `
 
-	podStopCommand = cli.Command{
-		Name:         "stop",
-		Usage:        "Stop one or more pods",
-		Description:  podStopDescription,
-		Flags:        sortFlags(podStopFlags),
-		Action:       podStopCmd,
-		ArgsUsage:    "POD-NAME [POD-NAME ...]",
-		OnUsageError: usageErrorHandler,
+	_podStopCommand = &cobra.Command{
+		Use:   "stop",
+		Short: "Stop one or more pods",
+		Long:  podStopDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			podStopCommand.InputArgs = args
+			podStopCommand.GlobalFlags = MainGlobalOpts
+			return podStopCmd(&podStopCommand)
+		},
+		Example: "POD-NAME [POD-NAME ...]",
 	}
 )
 
-func podStopCmd(c *cli.Context) error {
+func init() {
+	podStopCommand.Command = _podStopCommand
+	flags := podStopCommand.Flags()
+	flags.BoolVarP(&podStopCommand.All, "all", "a", false, "Stop all running pods")
+	flags.BoolVarP(&podStopCommand.Latest, "latest", "l", false, "Stop the latest pod podman is aware of")
+	flags.UintVarP(&podStopCommand.Timeout, "timeout", "t", 0, "Seconds to wait for pod stop before killing the container")
+}
+
+func podStopCmd(c *cliconfig.PodStopValues) error {
 	timeout := -1
-	if err := checkMutuallyExclusiveFlags(c); err != nil {
+	if err := checkMutuallyExclusiveFlags(&c.PodmanCommand); err != nil {
 		return err
 	}
 
-	runtime, err := libpodruntime.GetRuntime(c)
+	runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
@@ -52,12 +54,12 @@ func podStopCmd(c *cli.Context) error {
 	// getPodsFromContext returns an error when a requested pod
 	// isn't found. The only fatal error scenerio is when there are no pods
 	// in which case the following loop will be skipped.
-	pods, lastError := getPodsFromContext(c, runtime)
+	pods, lastError := getPodsFromContext(&c.PodmanCommand, runtime)
 
 	ctx := getContext()
 
-	if c.IsSet("timeout") {
-		timeout = int(c.Uint("timeout"))
+	if c.Flag("timeout").Changed {
+		timeout = int(c.Timeout)
 	}
 	for _, pod := range pods {
 		// set cleanup to true to clean mounts and namespaces