From: Sage Weil <sage@inktank.com>
Date: Wed, 16 Oct 2013 00:46:15 +0000 (-0700)
Subject: ceph, ceph-authtool: fix cli tests
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46c383e8bddc346e83ea634c64e7c2e233ba1124;p=ceph.git

ceph, ceph-authtool: fix cli tests

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/test/cli/ceph-authtool/help.t b/src/test/cli/ceph-authtool/help.t
index 7434ec4a7c0..062c967a154 100644
--- a/src/test/cli/ceph-authtool/help.t
+++ b/src/test/cli/ceph-authtool/help.t
@@ -10,9 +10,15 @@
                                   'mount -o secret=..' argument
     -C, --create-keyring          will create a new keyring, overwriting any
                                   existing keyringfile
-    --gen-key                     will generate a new secret key for the
+    -g, --gen-key                 will generate a new secret key for the
                                   specified entityname
-    --add-key                     will add an encoded key to the keyring
+    --gen-print-key               will generate a new secret key without set it
+                                  to the keyringfile, prints the secret to stdout
+    --import-keyring              will import the content of a given keyring
+                                  into the keyringfile
+    -u, --set-uid                 sets the auid (authenticated user id) for the
+                                  specified entityname
+    -a, --add-key                 will add an encoded key to the keyring
     --cap subsystem capability    will set the capability for given subsystem
     --caps capsfile               will set all of capabilities associated with a
                                   given key, for all subsystems
diff --git a/src/test/cli/ceph-authtool/manpage.t b/src/test/cli/ceph-authtool/manpage.t
index 69e15fa51c3..a9e1408d716 100644
--- a/src/test/cli/ceph-authtool/manpage.t
+++ b/src/test/cli/ceph-authtool/manpage.t
@@ -9,9 +9,15 @@
                                   'mount -o secret=..' argument
     -C, --create-keyring          will create a new keyring, overwriting any
                                   existing keyringfile
-    --gen-key                     will generate a new secret key for the
+    -g, --gen-key                 will generate a new secret key for the
                                   specified entityname
-    --add-key                     will add an encoded key to the keyring
+    --gen-print-key               will generate a new secret key without set it
+                                  to the keyringfile, prints the secret to stdout
+    --import-keyring              will import the content of a given keyring
+                                  into the keyringfile
+    -u, --set-uid                 sets the auid (authenticated user id) for the
+                                  specified entityname
+    -a, --add-key                 will add an encoded key to the keyring
     --cap subsystem capability    will set the capability for given subsystem
     --caps capsfile               will set all of capabilities associated with a
                                   given key, for all subsystems
diff --git a/src/test/cli/ceph-authtool/simple.t b/src/test/cli/ceph-authtool/simple.t
index 69d027c1342..b86476a5ad0 100644
--- a/src/test/cli/ceph-authtool/simple.t
+++ b/src/test/cli/ceph-authtool/simple.t
@@ -9,9 +9,15 @@
                                   'mount -o secret=..' argument
     -C, --create-keyring          will create a new keyring, overwriting any
                                   existing keyringfile
-    --gen-key                     will generate a new secret key for the
+    -g, --gen-key                 will generate a new secret key for the
                                   specified entityname
-    --add-key                     will add an encoded key to the keyring
+    --gen-print-key               will generate a new secret key without set it
+                                  to the keyringfile, prints the secret to stdout
+    --import-keyring              will import the content of a given keyring
+                                  into the keyringfile
+    -u, --set-uid                 sets the auid (authenticated user id) for the
+                                  specified entityname
+    -a, --add-key                 will add an encoded key to the keyring
     --cap subsystem capability    will set the capability for given subsystem
     --caps capsfile               will set all of capabilities associated with a
                                   given key, for all subsystems
diff --git a/src/test/cli/ceph/help.t b/src/test/cli/ceph/help.t
index bafc3b9633f..1b8f67b1955 100644
--- a/src/test/cli/ceph/help.t
+++ b/src/test/cli/ceph/help.t
@@ -60,6 +60,7 @@
     ceph osd reweight <osd-id> <weight>
     ceph osd blacklist add <address>[:source_port] [time]
     ceph osd blacklist rm <address>[:source_port]
+    ceph osd lspools
     ceph osd pool mksnap <pool> <snapname>
     ceph osd pool rmsnap <pool> <snapname>
     ceph osd pool create <pool> <pg_num> [<pgp_num>]