vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor the container CLI

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-08-29 13:08:07 -07:00
parent ea77713223
commit a2fee5a256
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cmd/client/main.go
View file

@ -199,11 +199,8 @@ func main() {
app.Commands = []cli.Command{ app.Commands = []cli.Command{
podSandboxCommand, podSandboxCommand,
containerCommand,
runtimeVersionCommand, runtimeVersionCommand,
createContainerCommand,
startContainerCommand,
stopContainerCommand,
removeContainerCommand,
pullImageCommand, pullImageCommand,
} }
@ -354,12 +351,23 @@ var removePodSandboxCommand = cli.Command{
}, },
} }
var containerCommand = cli.Command{
Name: "container",
Aliases: []string{"ctr"},
Subcommands: []cli.Command{
createContainerCommand,
startContainerCommand,
stopContainerCommand,
removeContainerCommand,
},
}
var createContainerCommand = cli.Command{ var createContainerCommand = cli.Command{
Name: "createcontainer", Name: "create",
Usage: "create a container", Usage: "create a container",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "sandbox", Name: "pod",
Usage: "the id of the pod sandbox to which the container belongs", Usage: "the id of the pod sandbox to which the container belongs",
}, },
cli.StringFlag{ cli.StringFlag{
@ -377,11 +385,11 @@ var createContainerCommand = cli.Command{
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)
if !context.IsSet("sandbox") { if !context.IsSet("pod") {
return fmt.Errorf("Please specify the id of the pod sandbox to which the container belongs via the --sandbox option") return fmt.Errorf("Please specify the id of the pod sandbox to which the container belongs via the --pod option")
} }
// Test RuntimeServiceClient.CreateContainer // Test RuntimeServiceClient.CreateContainer
err = CreateContainer(client, context.String("sandbox"), context.String("config")) err = CreateContainer(client, context.String("pod"), context.String("config"))
if err != nil { if err != nil {
return fmt.Errorf("Creating the pod sandbox failed: %v", err) return fmt.Errorf("Creating the pod sandbox failed: %v", err)
} }
@ -390,7 +398,7 @@ var createContainerCommand = cli.Command{
} }
var startContainerCommand = cli.Command{ var startContainerCommand = cli.Command{
Name: "startcontainer", Name: "start",
Usage: "start a container", Usage: "start a container",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
@ -417,7 +425,7 @@ var startContainerCommand = cli.Command{
} }
var stopContainerCommand = cli.Command{ var stopContainerCommand = cli.Command{
Name: "stopcontainer", Name: "stop",
Usage: "stop a container", Usage: "stop a container",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
@ -444,7 +452,7 @@ var stopContainerCommand = cli.Command{
} }
var removeContainerCommand = cli.Command{ var removeContainerCommand = cli.Command{
Name: "removecontainer", Name: "remove",
Usage: "remove a container", Usage: "remove a container",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{