librbd: Modify related test cases

Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>

diff --git a/src/test/librbd/journal/test_Replay.cc b/src/test/librbd/journal/test_Replay.cc
index 76e0cdab7c6c6d4b870e5368fc430f1c8f5f597a..f79d752a15a930cd522c6def0b01bd7fe5dfd8de 100644 (file)
--- a/src/test/librbd/journal/test_Replay.cc
+++ b/src/test/librbd/journal/test_Replay.cc
@@ -14,6 +14,7 @@
 #include "librbd/internal.h"
 #include "librbd/Journal.h"
 #include "librbd/Operations.h"
+#include "librbd/api/Snapshot.h"
 #include "librbd/io/AioCompletion.h"
 #include "librbd/io/ImageDispatchSpec.h"
 #include "librbd/io/ImageRequest.h"
@@ -374,7 +375,7 @@ TEST_F(TestJournalReplay, SnapProtect) {
   ASSERT_EQ(initial_entry + 2, current_entry);
 
   bool is_protected;
-  ASSERT_EQ(0, librbd::snap_is_protected(ictx, "snap", &is_protected));
+  ASSERT_EQ(0, librbd::api::Snapshot<>::is_protected(ictx, "snap", &is_protected));
   ASSERT_TRUE(is_protected);
 
   // verify lock ordering constraints
@@ -427,7 +428,7 @@ TEST_F(TestJournalReplay, SnapUnprotect) {
   ASSERT_EQ(initial_entry + 2, current_entry);
 
   bool is_protected;
-  ASSERT_EQ(0, librbd::snap_is_protected(ictx, "snap", &is_protected));
+  ASSERT_EQ(0, librbd::api::Snapshot<>::is_protected(ictx, "snap", &is_protected));
   ASSERT_FALSE(is_protected);
 
   // verify lock ordering constraints

diff --git a/src/test/librbd/test_DeepCopy.cc b/src/test/librbd/test_DeepCopy.cc
index f188d01b422da0f745ff5d467300385c45df1306..6bdb82c1cd9cc8bdaf817387538f912636a46a0a 100644 (file)
--- a/src/test/librbd/test_DeepCopy.cc
+++ b/src/test/librbd/test_DeepCopy.cc
@@ -5,6 +5,7 @@
 #include "test/librbd/test_support.h"
 #include "librbd/Operations.h"
 #include "librbd/api/Image.h"
+#include "librbd/api/Snapshot.h"
 #include "librbd/internal.h"
 #include "librbd/io/ImageRequestWQ.h"
 #include "librbd/io/ReadResult.h"
@@ -59,8 +60,8 @@ struct TestDeepCopy : public TestFixture {
     vector<librbd::snap_info_t> src_snaps, dst_snaps;
 
     EXPECT_EQ(m_src_ictx->size, m_dst_ictx->size);
-    EXPECT_EQ(0, librbd::snap_list(m_src_ictx, src_snaps));
-    EXPECT_EQ(0, librbd::snap_list(m_dst_ictx, dst_snaps));
+    EXPECT_EQ(0, librbd::api::Snapshot<>::list(m_src_ictx, src_snaps));
+    EXPECT_EQ(0, librbd::api::Snapshot<>::list(m_dst_ictx, dst_snaps));
     EXPECT_EQ(src_snaps.size(), dst_snaps.size());
     for (size_t i = 0; i <= src_snaps.size(); i++) {
       const char *src_snap_name = nullptr;

diff --git a/src/test/librbd/test_Migration.cc b/src/test/librbd/test_Migration.cc
index 0a395cba43e30ff59fe5dca707b48fd57b9d805f..6b42880ede347c6aec9a79922e3be1454e5a29e2 100644 (file)
--- a/src/test/librbd/test_Migration.cc
+++ b/src/test/librbd/test_Migration.cc
@@ -11,6 +11,7 @@
 #include "librbd/api/Migration.h"
 #include "librbd/api/Mirror.h"
 #include "librbd/api/Namespace.h"
+#include "librbd/api/Snapshot.h"
 #include "librbd/image/AttachChildRequest.h"
 #include "librbd/image/AttachParentRequest.h"
 #include "librbd/internal.h"
@@ -70,8 +71,8 @@ struct TestMigration : public TestFixture {
     vector<librbd::snap_info_t> src_snaps, dst_snaps;
 
     EXPECT_EQ(m_ref_ictx->size, m_ictx->size);
-    EXPECT_EQ(0, librbd::snap_list(m_ref_ictx, src_snaps));
-    EXPECT_EQ(0, librbd::snap_list(m_ictx, dst_snaps));
+    EXPECT_EQ(0, librbd::api::Snapshot<>::list(m_ref_ictx, src_snaps));
+    EXPECT_EQ(0, librbd::api::Snapshot<>::list(m_ictx, dst_snaps));
     EXPECT_EQ(src_snaps.size(), dst_snaps.size());
     for (size_t i = 0; i <= src_snaps.size(); i++) {
       const char *src_snap_name = nullptr;

diff --git a/src/test/librbd/test_internal.cc b/src/test/librbd/test_internal.cc
index 2ea2d1701fedfe78dae0e7c4db2d96e749444f0e..26cea7e06a067f1081c260d4cd80162cf25fdce2 100644 (file)
--- a/src/test/librbd/test_internal.cc
+++ b/src/test/librbd/test_internal.cc
@@ -17,6 +17,7 @@
 #include "librbd/api/Image.h"
 #include "librbd/api/Migration.h"
 #include "librbd/api/PoolMetadata.h"
+#include "librbd/api/Snapshot.h"
 #include "librbd/io/AioCompletion.h"
 #include "librbd/io/ImageRequest.h"
 #include "librbd/io/ImageRequestWQ.h"
@@ -1776,7 +1777,7 @@ TEST_F(TestInternal, MissingDataPool) {
   ASSERT_EQ(0, librbd::info(ictx, info, sizeof(info)));
 
   vector<librbd::snap_info_t> snaps;
-  EXPECT_EQ(0, librbd::snap_list(ictx, snaps));
+  EXPECT_EQ(0, librbd::api::Snapshot<>::list(ictx, snaps));
   EXPECT_EQ(1U, snaps.size());
   EXPECT_EQ("snap1", snaps[0].name);