From e3531497d4c20738542115fcc5b0cf5ecebe734a Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Tue, 10 Jul 2012 12:51:26 -0700 Subject: [PATCH] rbd: update cli test reference files Signed-off-by: Dan Mick --- src/test/cli/rbd/help.t | 35 +-- src/test/cli/rbd/invalid-snap-usage.t | 315 +++++++++++++++----------- 2 files changed, 210 insertions(+), 140 deletions(-) diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t index 3c916f1659632..a7c1a126eeb0c 100644 --- a/src/test/cli/rbd/help.t +++ b/src/test/cli/rbd/help.t @@ -2,39 +2,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as diff --git a/src/test/cli/rbd/invalid-snap-usage.t b/src/test/cli/rbd/invalid-snap-usage.t index 678b0ba3757a8..63157bfbb7151 100644 --- a/src/test/cli/rbd/invalid-snap-usage.t +++ b/src/test/cli/rbd/invalid-snap-usage.t @@ -3,39 +3,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as @@ -46,39 +53,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as @@ -89,39 +103,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as @@ -132,39 +153,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as @@ -175,39 +203,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as @@ -218,39 +253,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as @@ -261,39 +303,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as @@ -304,39 +353,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as @@ -347,39 +403,46 @@ usage: rbd [-n ] [OPTIONS] ... where 'pool' is a rados pool name (default is 'rbd') and 'cmd' is one of: (ls | list) [pool-name] list rbd images - info [--snap ] show information about image size, + info show information about image size, striping, etc. create [--order ] --size create an empty image + clone [--order ] + clone a snapshot into a COW + child image resize --size resize (expand or contract) image rm delete an image - export [--snap ] export image to file - import import image from file (dest defaults + export export image to file + import import image from file + (dest defaults) as the filename part of file) - (cp | copy) [--snap ] copy src image to dest + (cp | copy) copy src image to dest (mv | rename) rename src image to dest snap ls dump list of image snapshots - snap create --snap create a snapshot - snap rollback --snap rollback image head to snapshot - snap rm --snap deletes a snapshot + snap create create a snapshot + snap rollback rollback image to snapshot + snap rm deletes a snapshot snap purge deletes all snapshots watch watch events on image - map map the image to a block device + map map image to a block device using the kernel unmap unmap a rbd device that was mapped by the kernel showmapped show the rbd images mapped by the kernel + , are [pool/]name[@snap], or you may specify + individual pieces of names with -p/--pool, --image, and/or --snap. + Other input options: -p, --pool source pool name --image image name - --dest destination [pool and] image name - --snap specify snapshot name + --dest destination [pool and] image name + --snap snapshot name --dest-pool destination pool name - --path path name for import/export (if not specified) - --size size parameter for create and resize commands - --order the object size in bits, such that the objects - are (1 << order) bytes. Default is 22 (4 MB). + --path path name for import/export + --size size of image for create and resize + --order the object size in bits; object size will be + (1 << order) bytes. Default is 22 (4 MB). For the map command: --user rados user to authenticate as -- 2.39.5