From c7990c66cd966f42adeae676f197317b190dd92f Mon Sep 17 00:00:00 2001
From: songweibin <song.weibin@zte.com.cn>
Date: Wed, 31 Jan 2018 10:13:34 +0800
Subject: [PATCH] rbd: s/group-spec/group-snap-spec for group snapshot

Signed-off-by: songweibin <song.weibin@zte.com.cn>
---
 src/test/cli/rbd/help.t        | 12 ++++++------
 src/tools/rbd/ArgumentTypes.cc |  2 +-
 src/tools/rbd/ArgumentTypes.h  |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 5007698f34d5a..bbabd2cb3816c 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -593,12 +593,12 @@ Skip test on FreeBSD as it generates different output there.
   
   rbd help group snap create
   usage: rbd group snap create [--pool <pool>] [--group <group>] [--snap <snap>] 
-                               <group-spec> 
+                               <group-snap-spec> 
   
   Make a snapshot of a group.
   
   Positional arguments
-    <group-spec>         group specification
+    <group-snap-spec>    group specification
                          (example: [<pool-name>/]<group-name>@<snap-name>)
   
   Optional arguments
@@ -625,12 +625,12 @@ Skip test on FreeBSD as it generates different output there.
   
   rbd help group snap remove
   usage: rbd group snap remove [--pool <pool>] [--group <group>] [--snap <snap>] 
-                               <group-spec> 
+                               <group-snap-spec> 
   
   Remove a snapshot from a group.
   
   Positional arguments
-    <group-spec>         group specification
+    <group-snap-spec>    group specification
                          (example: [<pool-name>/]<group-name>@<snap-name>)
   
   Optional arguments
@@ -641,12 +641,12 @@ Skip test on FreeBSD as it generates different output there.
   rbd help group snap rename
   usage: rbd group snap rename [--pool <pool>] [--group <group>] [--snap <snap>] 
                                [--dest-snap <dest-snap>] 
-                               <group-spec> <dest-snap> 
+                               <group-snap-spec> <dest-snap> 
   
   Rename group's snapshot.
   
   Positional arguments
-    <group-spec>         group specification
+    <group-snap-spec>    group specification
                          (example: [<pool-name>/]<group-name>@<snap-name>)
     <dest-snap>          destination snapshot name
                          (example: <snapshot-name>)
diff --git a/src/tools/rbd/ArgumentTypes.cc b/src/tools/rbd/ArgumentTypes.cc
index 132a520a8badf..6edcf9cebb76a 100644
--- a/src/tools/rbd/ArgumentTypes.cc
+++ b/src/tools/rbd/ArgumentTypes.cc
@@ -227,7 +227,7 @@ void add_group_spec_options(po::options_description *pos,
   } else {
     add_snap_option(opt, modifier);
     pos->add_options()
-      ((get_name_prefix(modifier) + GROUP_SPEC).c_str(),
+      ((get_name_prefix(modifier) + GROUP_SNAP_SPEC).c_str(),
        (get_description_prefix(modifier) + "group specification\n" +
          "(example: [<pool-name>/]<group-name>@<snap-name>)").c_str());
   }
diff --git a/src/tools/rbd/ArgumentTypes.h b/src/tools/rbd/ArgumentTypes.h
index 0958b14d46b65..1d5d8a817375e 100644
--- a/src/tools/rbd/ArgumentTypes.h
+++ b/src/tools/rbd/ArgumentTypes.h
@@ -37,6 +37,7 @@ static const std::string POSITIONAL_COMMAND_SPEC("positional-command-spec");
 static const std::string POSITIONAL_ARGUMENTS("positional-arguments");
 static const std::string IMAGE_SPEC("image-spec");
 static const std::string GROUP_SPEC("group-spec");
+static const std::string GROUP_SNAP_SPEC("group-snap-spec");
 static const std::string SNAPSHOT_SPEC("snap-spec");
 static const std::string IMAGE_OR_SNAPSHOT_SPEC("image-or-snap-spec");
 static const std::string JOURNAL_SPEC("journal-spec");
-- 
2.39.5