update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / tools / rbd / ArgumentTypes.h

diff --git a/ceph/src/tools/rbd/ArgumentTypes.h b/ceph/src/tools/rbd/ArgumentTypes.h
index 1f7da09764342ee351fb55146ae3547dbe883b13..23bb02b9cd0ce9c2526c1c14d86f940c4f425c64 100644 (file)
--- a/ceph/src/tools/rbd/ArgumentTypes.h
+++ b/ceph/src/tools/rbd/ArgumentTypes.h
@@ -36,10 +36,8 @@ static const std::string DEST_PREFIX("dest-");
 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 SNAPSHOT_SPEC("snap-spec");
 static const std::string IMAGE_OR_SNAPSHOT_SPEC("image-or-snap-spec");
-static const std::string JOURNAL_SPEC("journal-spec");
 static const std::string PATH_NAME("path-name");
 static const std::string IMAGE_ID("image-id");
 
@@ -47,14 +45,13 @@ static const std::string IMAGE_ID("image-id");
 static const std::string CONFIG_PATH("conf");
 static const std::string POOL_NAME("pool");
 static const std::string DEST_POOL_NAME("dest-pool");
+static const std::string NAMESPACE_NAME("namespace");
+static const std::string DEST_NAMESPACE_NAME("dest-namespace");
 static const std::string IMAGE_NAME("image");
 static const std::string DEST_IMAGE_NAME("dest");
-static const std::string GROUP_NAME("group");
-static const std::string DEST_GROUP_NAME("dest-group");
 static const std::string SNAPSHOT_NAME("snap");
+static const std::string SNAPSHOT_ID("snap-id");
 static const std::string DEST_SNAPSHOT_NAME("dest-snap");
-static const std::string JOURNAL_NAME("journal");
-static const std::string DEST_JOURNAL_NAME("dest-journal");
 static const std::string PATH("path");
 static const std::string FROM_SNAPSHOT_NAME("from-snap");
 static const std::string WHOLE_OBJECT("whole-object");
@@ -70,6 +67,8 @@ static const std::string IMAGE_STRIPE_UNIT("stripe-unit");
 static const std::string IMAGE_STRIPE_COUNT("stripe-count");
 static const std::string IMAGE_DATA_POOL("data-pool");
 static const std::string IMAGE_SPARSE_SIZE("sparse-size");
+static const std::string IMAGE_THICK_PROVISION("thick-provision");
+static const std::string IMAGE_FLATTEN("flatten");
 
 static const std::string JOURNAL_OBJECT_SIZE("journal-object-size");
 static const std::string JOURNAL_SPLAY_WIDTH("journal-splay-width");
@@ -81,8 +80,6 @@ static const std::string PRETTY_FORMAT("pretty-format");
 static const std::string VERBOSE("verbose");
 static const std::string NO_ERROR("no-error");
 
-static const std::string DELAY("delay");
-
 static const std::string LIMIT("limit");
 
 static const std::set<std::string> SWITCH_ARGUMENTS = {
@@ -125,13 +122,14 @@ void add_export_format_option(boost::program_options::options_description *opt);
 std::string get_name_prefix(ArgumentModifier modifier);
 std::string get_description_prefix(ArgumentModifier modifier);
 
-
-void add_special_pool_option(boost::program_options::options_description *opt,
-                            std::string prefix);
+void add_all_option(boost::program_options::options_description *opt,
+                   std::string description);
 
 void add_pool_option(boost::program_options::options_description *opt,
                      ArgumentModifier modifier,
                      const std::string &desc_suffix = "");
+void add_namespace_option(boost::program_options::options_description *opt,
+                          ArgumentModifier modifier);
 
 void add_image_option(boost::program_options::options_description *opt,
                       ArgumentModifier modifier,
@@ -140,28 +138,18 @@ void add_image_option(boost::program_options::options_description *opt,
 void add_image_id_option(boost::program_options::options_description *opt,
                          const std::string &desc_suffix = "");
 
-void add_group_option(boost::program_options::options_description *opt,
-                     ArgumentModifier modifier,
-                     const std::string &desc_suffix = "");
-
 void add_snap_option(boost::program_options::options_description *opt,
                      ArgumentModifier modifier);
-
-void add_journal_option(boost::program_options::options_description *opt,
-                      ArgumentModifier modifier,
-                      const std::string &desc_suffix = "");
+void add_snap_id_option(boost::program_options::options_description *opt);
 
 void add_pool_options(boost::program_options::options_description *pos,
-                      boost::program_options::options_description *opt);
+                      boost::program_options::options_description *opt,
+                      bool namespaces_supported);
 
 void add_image_spec_options(boost::program_options::options_description *pos,
                             boost::program_options::options_description *opt,
                             ArgumentModifier modifier);
 
-void add_group_spec_options(boost::program_options::options_description *pos,
-                           boost::program_options::options_description *opt,
-                           ArgumentModifier modifier);
-
 void add_snap_spec_options(boost::program_options::options_description *pos,
                            boost::program_options::options_description *opt,
                            ArgumentModifier modifier);
@@ -171,11 +159,6 @@ void add_image_or_snap_spec_options(
   boost::program_options::options_description *opt,
   ArgumentModifier modifier);
 
-void add_journal_spec_options(
-  boost::program_options::options_description *pos,
-  boost::program_options::options_description *opt,
-  ArgumentModifier modifier);
-
 void add_create_image_options(boost::program_options::options_description *opt,
                               bool include_format);
 
@@ -200,6 +183,8 @@ void add_verbose_option(boost::program_options::options_description *opt);
 
 void add_no_error_option(boost::program_options::options_description *opt);
 
+void add_flatten_option(boost::program_options::options_description *opt);
+
 std::string get_short_features_help(bool append_suffix);
 std::string get_long_features_help();