From 3f48986ea043ba83a671555c205eee09ecfd4013 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Mon, 10 Oct 2016 20:57:17 +1100
Subject: [PATCH] cmd: switch to --connect and --listen flags

Signed-off-by: Aleksa Sarai <asarai@suse.de>
---
 cmd/client/main.go | 4 ++--
 cmd/server/main.go | 9 +++++----
 test/helpers.bash  | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cmd/client/main.go b/cmd/client/main.go
index fe9cb54d..e98469c8 100644
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -19,7 +19,7 @@ const (
 )
 
 func getClientConnection(context *cli.Context) (*grpc.ClientConn, error) {
-	conn, err := grpc.Dial(context.GlobalString("socket"), grpc.WithInsecure(), grpc.WithTimeout(timeout),
+	conn, err := grpc.Dial(context.GlobalString("connect"), grpc.WithInsecure(), grpc.WithTimeout(timeout),
 		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
 			return net.DialTimeout("unix", addr, timeout)
 		}))
@@ -83,7 +83,7 @@ func main() {
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
-			Name:  "socket",
+			Name:  "connect",
 			Value: "/var/run/ocid.sock",
 			Usage: "Socket to connect to",
 		},
diff --git a/cmd/server/main.go b/cmd/server/main.go
index b6c2c67b..3c11eff2 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -53,7 +53,7 @@ func main() {
 			Usage: "ocid container dir",
 		},
 		cli.StringFlag{
-			Name:  "socket",
+			Name:  "listen",
 			Value: "/var/run/ocid.sock",
 			Usage: "path to ocid socket",
 		},
@@ -67,7 +67,7 @@ func main() {
 			Usage: "enable debug output for logging",
 		},
 		cli.BoolFlag{
-			Name:  "selinux-enabled",
+			Name:  "selinux",
 			Usage: "enable selinux support",
 		},
 		cli.StringFlag{
@@ -86,7 +86,7 @@ func main() {
 		if c.GlobalBool("debug") {
 			logrus.SetLevel(logrus.DebugLevel)
 		}
-		if !c.GlobalBool("selinux-enabled") {
+		if !c.GlobalBool("selinux") {
 			selinux.SetDisabled()
 		}
 		if path := c.GlobalString("log"); path != "" {
@@ -108,11 +108,12 @@ func main() {
 		default:
 			return fmt.Errorf("unknown log-format %q", c.GlobalString("log-format"))
 		}
+
 		return nil
 	}
 
 	app.Action = func(c *cli.Context) error {
-		socketPath := c.String("socket")
+		socketPath := c.String("listen")
 		// Remove the socket if it already exists
 		if _, err := os.Stat(socketPath); err == nil {
 			if err := os.Remove(socketPath); err != nil {
diff --git a/test/helpers.bash b/test/helpers.bash
index 17bbe3af..bffad44b 100644
--- a/test/helpers.bash
+++ b/test/helpers.bash
@@ -36,7 +36,7 @@ function ocid() {
 
 # Run ocic using the binary specified by $OCID_BINARY.
 function ocic() {
-	"$OCIC_BINARY" --socket "$OCID_SOCKET" "$@"
+	"$OCIC_BINARY" --connect "$OCID_SOCKET" "$@"
 }
 
 # Communicate with Docker on the host machine.
@@ -72,7 +72,7 @@ function wait_until_reachable() {
 
 # Start ocid.
 function start_ocid() {
-	"$OCID_BINARY" --conmon "$CONMON_BINARY" --pause "$PAUSE_BINARY" --debug --socket "$TESTDIR/ocid.sock" --runtime "$RUNC_BINARY" --root "$TESTDIR/ocid" --sandboxdir "$TESTDIR/sandboxes" --containerdir "$TESTDIR/ocid/containers" & OCID_PID=$!
+	"$OCID_BINARY" --conmon "$CONMON_BINARY" --pause "$PAUSE_BINARY" --debug --listen "$TESTDIR/ocid.sock" --runtime "$RUNC_BINARY" --root "$TESTDIR/ocid" --sandboxdir "$TESTDIR/sandboxes" --containerdir "$TESTDIR/ocid/containers" & OCID_PID=$!
 	wait_until_reachable
 }