update ceph source to reef 18.1.2

[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 39d374c64c3cd5e2ad86e2c4b3aecc851b7b7d64..db16b4b3cf01b538339cfc1cb5998cd1e642f4c0 100644 (file)
--- a/ceph/src/tools/rbd/ArgumentTypes.h
+++ b/ceph/src/tools/rbd/ArgumentTypes.h
@@ -56,6 +56,10 @@ static const std::string PATH("path");
 static const std::string FROM_SNAPSHOT_NAME("from-snap");
 static const std::string WHOLE_OBJECT("whole-object");
 
+// encryption arguments
+static const std::string ENCRYPTION_FORMAT("encryption-format");
+static const std::string ENCRYPTION_PASSPHRASE_FILE("encryption-passphrase-file");
+
 static const std::string IMAGE_FORMAT("image-format");
 static const std::string IMAGE_NEW_FORMAT("new-format");
 static const std::string IMAGE_ORDER("order");
@@ -127,6 +131,9 @@ struct ExportFormat {};
 struct Secret {};
 
 struct EncryptionAlgorithm {};
+struct EncryptionFormat {
+  uint64_t format;
+};
 
 void add_export_format_option(boost::program_options::options_description *opt);
 
@@ -198,6 +205,8 @@ void add_flatten_option(boost::program_options::options_description *opt);
 
 void add_snap_create_options(boost::program_options::options_description *opt);
 
+void add_encryption_options(boost::program_options::options_description *opt);
+
 std::string get_short_features_help(bool append_suffix);
 std::string get_long_features_help();
 
@@ -221,6 +230,8 @@ void validate(boost::any& v, const std::vector<std::string>& values,
               JournalObjectSize *target_type, int);
 void validate(boost::any& v, const std::vector<std::string>& values,
               EncryptionAlgorithm *target_type, int);
+void validate(boost::any& v, const std::vector<std::string>& values,
+              EncryptionFormat *target_type, int);
 void validate(boost::any& v, const std::vector<std::string>& values,
               Secret *target_type, int);