From 42de6873f9ca33fc20e70176d9a422635a6f0152 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Jul 2012 16:48:18 -0700 Subject: [PATCH] rbd: fix usage for snap commands Snap commands take '--snap '. Signed-off-by: Sage Weil --- src/rbd.cc | 7 +-- src/test/cli/rbd/help.t | 7 +-- src/test/cli/rbd/invalid-snap-usage.t | 63 +++++++++++++++------------ 3 files changed, 44 insertions(+), 33 deletions(-) diff --git a/src/rbd.cc b/src/rbd.cc index 020071db3ae7e..4e34f1f0fb0be 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -81,9 +81,10 @@ void usage() " (cp | copy) copy src image to dest\n" " (mv | rename) rename src image to dest\n" " snap ls dump list of image snapshots\n" -" snap create create a snapshot\n" -" snap rollback rollback image to snapshot\n" -" snap rm deletes a snapshot\n" +" snap create --snap create a snapshot\n" +" snap rollback --snap \n" +" rollback image to snapshot\n" +" snap rm --snap deletes a snapshot\n" " snap purge deletes all snapshots\n" " watch watch events on image\n" " map map image to a block device\n" diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t index a7c1a126eeb0c..d44d1db024111 100644 --- a/src/test/cli/rbd/help.t +++ b/src/test/cli/rbd/help.t @@ -17,9 +17,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map 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 63157bfbb7151..7669ed4fc261a 100644 --- a/src/test/cli/rbd/invalid-snap-usage.t +++ b/src/test/cli/rbd/invalid-snap-usage.t @@ -18,9 +18,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device @@ -68,9 +69,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device @@ -118,9 +120,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device @@ -168,9 +171,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device @@ -218,9 +222,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device @@ -268,9 +273,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device @@ -318,9 +324,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device @@ -368,9 +375,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device @@ -418,9 +426,10 @@ (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create create a snapshot - snap rollback rollback image to snapshot - snap rm deletes a snapshot + snap create --snap create a snapshot + snap rollback --snap + rollback image to snapshot + snap rm --snap deletes a snapshot snap purge deletes all snapshots watch watch events on image map map image to a block device -- 2.39.5