Revert "rbd: fix usage for snap commands"

This reverts commit 42de6873f9ca33fc20e70176d9a422635a6f0152.

Actually, these are fine!  Dan made them all kinds of fancy.

diff --git a/src/rbd.cc b/src/rbd.cc
index 4e34f1f0fb0be545889e034124bc8d6a790922d1..020071db3ae7e60509606fd2d2c733381085477f 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -81,10 +81,9 @@ void usage()
 "  (cp | copy) <src> <dest>                    copy src image to dest\n"
 "  (mv | rename) <src> <dest>                  rename src image to dest\n"
 "  snap ls <image-name>                        dump list of image snapshots\n"
-"  snap create --snap <snap-name> <image-name> create a snapshot\n"
-"  snap rollback --snap <snap-name> <image-name>\n"
-"                                              rollback image to snapshot\n"
-"  snap rm --snap <snap-name> <image-name>     deletes a snapshot\n"
+"  snap create <snap-name>                     create a snapshot\n"
+"  snap rollback <snap-name>                   rollback image to snapshot\n"
+"  snap rm <snap-name>                         deletes a snapshot\n"
 "  snap purge <image-name>                     deletes all snapshots\n"
 "  watch <image-name>                          watch events on image\n"
 "  map <image-name>                            map image to a block device\n"

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index d44d1db024111f0bd6b64225d1b576ea5c2c4775..a7c1a126eeb0ca3b55087fb431c9cb0d32efb045 100644 (file)
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -17,10 +17,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device

diff --git a/src/test/cli/rbd/invalid-snap-usage.t b/src/test/cli/rbd/invalid-snap-usage.t
index 7669ed4fc261a76867bec218a5d0e7af63fb7074..63157bfbb7151e4fff82751af2a132ab1062d1f3 100644 (file)
--- a/src/test/cli/rbd/invalid-snap-usage.t
+++ b/src/test/cli/rbd/invalid-snap-usage.t
@@ -18,10 +18,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device
@@ -69,10 +68,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device
@@ -120,10 +118,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device
@@ -171,10 +168,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device
@@ -222,10 +218,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device
@@ -273,10 +268,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device
@@ -324,10 +318,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device
@@ -375,10 +368,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device
@@ -426,10 +418,9 @@
     (cp | copy) <src> <dest>                    copy src image to dest
     (mv | rename) <src> <dest>                  rename src image to dest
     snap ls <image-name>                        dump list of image snapshots
-    snap create --snap <snap-name> <image-name> create a snapshot
-    snap rollback --snap <snap-name> <image-name>
-                                                rollback image to snapshot
-    snap rm --snap <snap-name> <image-name>     deletes a snapshot
+    snap create <snap-name>                     create a snapshot
+    snap rollback <snap-name>                   rollback image to snapshot
+    snap rm <snap-name>                         deletes a snapshot
     snap purge <image-name>                     deletes all snapshots
     watch <image-name>                          watch events on image
     map <image-name>                            map image to a block device