ceph: fix cli help test

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

diff --git a/src/test/cli/ceph/help.t b/src/test/cli/ceph/help.t
index 447a2e53f37624fa1eeee96050465f07a6c37efa..16667a5ad91f0776c923e3cc41733a5f416df406 100644 (file)
--- a/src/test/cli/ceph/help.t
+++ b/src/test/cli/ceph/help.t
@@ -1,23 +1,78 @@
 # TODO help should not fail
   $ ceph --help
-  usage: ceph [options] [commands]
+  usage:
+   ceph [options] [command]
+   ceph -s     cluster status summary
+   ceph -w     running cluster summary and events
+  
   If no commands are specified, enter interactive mode.
-  Commands:
-     (osd|pg|mds) stat -- get monitor subsystem status
-     ...
-  Options:
-     -i infile
-     -o outfile
-          specify input or output file (for certain commands)
-     -s or --status
-          print current system status
-     -w or --watch
-          watch system status changes in real time (push)
-  --conf/-c        Read configuration from the given configuration file
-  -d               Run in foreground, log to stderr.
-  -f               Run in foreground, log to usual location.
-  --id/-i          set ID portion of my name
-  --name/-n        set name (TYPE.ID)
-  --version        show version and quit
+  
+  CLUSTER COMMANDS
+    ceph health [detail]
+    ceph quorum_status
+    ceph -m <mon-ip-or-host> mon_status
+  
+  AUTHENTICATION (AUTH) COMMANDS
+    ceph auth get-or-create[-key] <name> [capsys1 capval1 [...]]
+    ceph auth del <name>
+    ceph auth list
+  
+  METADATA SERVER (MDS) COMMANDS
+    ceph mds stat
+    ceph mds tell <mds-id or *> injectargs '--<switch> <value> [--<switch> <value>...]'
+  
+  MONITOR (MON) COMMANDS
+    ceph mon add <name> <ip>[:<port>]
+    ceph mon delete <name>
+    ceph mon stat
+    ceph mon tell <mon-id or *> injectargs '--<switch> <value> [--<switch> <value>...]'
+  
+  OBJECT STORAGE DEVICE (OSD) COMMANDS
+    ceph osd dump [--format=json]
+    ceph osd tree
+    ceph osd down <osd-id>
+    ceph osd in <osd-id>
+    ceph osd out <osd-id>
+    ceph osd set <noout|noin|nodown|noup>
+    ceph osd unset <noout|noin|nodown|noup>
+    ceph osd pause
+    ceph osd unpause
+    ceph osd tell <osd-id or *> injectargs '--<switch> <value> [--<switch> <value>...]'
+    ceph osd getcrushmap -o <file>
+    ceph osd getmap -o <file>
+    ceph osd crush set <osd-id> <name> <weight> [<loc1> [<loc2> ...]]
+    ceph osd crush move <bucketname> <loc1> [<loc2> ...]
+    ceph osd crush reweight <name> <weight>
+    ceph osd create [<osd-id>]
+    ceph osd rm <osd-id> [<osd-id>...]
+    ceph osd lost [--yes-i-really-mean-it]
+    ceph osd reweight <osd-id> <weight>
+    ceph osd blacklist add <address>[:source_port] [time]
+    ceph osd blacklist rm <address>[:source_port]
+    ceph osd pool mksnap <pool> <snapname>
+    ceph osd pool rmsnap <pool> <snapname>
+    ceph osd pool create <pool> [<pg_num> [<pgp_num>]]
+    ceph osd pool delete <pool>
+    ceph osd pool rename <pool> <new pool name>
+    ceph osd pool set <pool> <field> <value>
+    ceph osd scrub <osd-id>
+    ceph osd repair <osd-id>
+    ceph osd tell N bench [bytes per write] [total bytes]
+  
+  PLACEMENT GROUP (PG) COMMANDS
+    ceph pg dump
+    ceph pg <pg-id> query
+    ceph pg scrub <pg-id>
+    ceph pg map <pg-id>
+  
+  OPTIONS
+    -o <file>        Write out to <file>
+    -i <file>        Read input from <file> (for some commands)
+    --conf/-c        Read configuration from the given configuration file
+    -d               Run in foreground, log to stderr.
+    -f               Run in foreground, log to usual location.
+    --id/-i          set ID portion of my name
+    --name/-n        set name (TYPE.ID)
+    --version        show version and quit
   
   [1]