tests: update cls_rbd tests for async snapshot methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index b53cfa8c00c061d064ceeeccd5bf164064c1648d..24dd38edc336936f9a9ef7de46d8c5ffc00e842a 100644 (file)
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -27,8 +27,6 @@ using ::librbd::cls_client::set_size;
 using ::librbd::cls_client::get_parent;
 using ::librbd::cls_client::set_parent;
 using ::librbd::cls_client::remove_parent;
-using ::librbd::cls_client::snapshot_add;
-using ::librbd::cls_client::snapshot_remove;
 using ::librbd::cls_client::add_child;
 using ::librbd::cls_client::remove_child;
 using ::librbd::cls_client::get_children;
@@ -49,7 +47,6 @@ using ::librbd::cls_client::get_protection_status;
 using ::librbd::cls_client::set_protection_status;
 using ::librbd::cls_client::get_stripe_unit_count;
 using ::librbd::cls_client::set_stripe_unit_count;
-using ::librbd::cls_client::old_snapshot_add;
 using ::librbd::cls_client::get_mutable_metadata;
 using ::librbd::cls_client::object_map_load;
 using ::librbd::cls_client::object_map_save;
@@ -65,6 +62,35 @@ using ::librbd::cls_client::metadata_list;
 using ::librbd::cls_client::metadata_get;
 using ::librbd::cls_client::snapshot_rename;
 
+
+static int snapshot_add(librados::IoCtx *ioctx, const std::string &oid,
+                        uint64_t snap_id, const std::string &snap_name) {
+  librados::ObjectWriteOperation op;
+  ::librbd::cls_client::snapshot_add(&op, snap_id, snap_name);
+  return ioctx->operate(oid, &op);
+}
+
+static int snapshot_remove(librados::IoCtx *ioctx, const std::string &oid,
+                           uint64_t snap_id) {
+  librados::ObjectWriteOperation op;
+  ::librbd::cls_client::snapshot_remove(&op, snap_id);
+  return ioctx->operate(oid, &op);
+}
+
+static int snapshot_rename(librados::IoCtx *ioctx, const std::string &oid,
+                           uint64_t snap_id, const std::string &snap_name) {
+  librados::ObjectWriteOperation op;
+  ::librbd::cls_client::snapshot_rename(&op, snap_id, snap_name);
+  return ioctx->operate(oid, &op);
+}
+
+static int old_snapshot_add(librados::IoCtx *ioctx, const std::string &oid,
+                            uint64_t snap_id, const std::string &snap_name) {
+  librados::ObjectWriteOperation op;
+  ::librbd::cls_client::old_snapshot_add(&op, snap_id, snap_name);
+  return ioctx->operate(oid, &op);
+}
+
 static char *random_buf(size_t len)
 {
   char *b = new char[len];