test/librados_test_stub: added 'get_min_compatible_client' API

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

diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc
index f4c7f8bef48f208e46a392f99b825ad9b7203527..ba2171f6df4247cc275b66e6b5eed10892db70d4 100644 (file)
--- a/src/test/librados_test_stub/LibradosTestStub.cc
+++ b/src/test/librados_test_stub/LibradosTestStub.cc
@@ -1007,6 +1007,13 @@ uint64_t Rados::get_instance_id() {
   return impl->get_instance_id();
 }
 
+int Rados::get_min_compatible_client(int8_t* min_compat_client,
+                                     int8_t* require_min_compat_client) {
+  TestRadosClient *impl = reinterpret_cast<TestRadosClient*>(client);
+  return impl->get_min_compatible_client(min_compat_client,
+                                         require_min_compat_client);
+}
+
 int Rados::init(const char * const id) {
   return rados_create(reinterpret_cast<rados_t *>(&client), id);
 }

diff --git a/src/test/librados_test_stub/MockTestMemRadosClient.h b/src/test/librados_test_stub/MockTestMemRadosClient.h
index 8fd5ad73e540cb044161528d51ef6e750342cc5d..1f44c499ded576038983c52406f76da50d04401f 100644 (file)
--- a/src/test/librados_test_stub/MockTestMemRadosClient.h
+++ b/src/test/librados_test_stub/MockTestMemRadosClient.h
@@ -35,6 +35,13 @@ public:
     return TestMemRadosClient::blacklist_add(client_address, expire_seconds);
   }
 
+  MOCK_METHOD2(get_min_compatible_client, int(int8_t*, int8_t*));
+  int do_get_min_compatible_client(int8_t* min_compat_client,
+                                   int8_t* require_min_compat_client) {
+    return TestMemRadosClient::get_min_compatible_client(
+      min_compat_client, require_min_compat_client);
+  }
+
   MOCK_METHOD3(service_daemon_register,
                int(const std::string&,
                    const std::string&,
@@ -58,6 +65,7 @@ public:
 
     ON_CALL(*this, create_ioctx(_, _)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_create_ioctx));
     ON_CALL(*this, blacklist_add(_, _)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_blacklist_add));
+    ON_CALL(*this, get_min_compatible_client(_, _)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_get_min_compatible_client));
     ON_CALL(*this, service_daemon_register(_, _, _)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_service_daemon_register));
     ON_CALL(*this, service_daemon_update_status_r(_)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_service_daemon_update_status_r));
   }

diff --git a/src/test/librados_test_stub/TestMemRadosClient.h b/src/test/librados_test_stub/TestMemRadosClient.h
index 3abf4360f0f15cb2f4758310d04250bac16d5c52..26db0795d69ba142910fb935c060d4dc1c2e7861 100644 (file)
--- a/src/test/librados_test_stub/TestMemRadosClient.h
+++ b/src/test/librados_test_stub/TestMemRadosClient.h
@@ -29,6 +29,13 @@ public:
     return m_global_id;
   }
 
+  int get_min_compatible_client(int8_t* min_compat_client,
+                                int8_t* require_min_compat_client) override {
+    *min_compat_client = CEPH_RELEASE_MIMIC;
+    *require_min_compat_client = CEPH_RELEASE_MIMIC;
+    return 0;
+  }
+
   void object_list(int64_t pool_id,
                    std::list<librados::TestRadosClient::Object> *list) override;
 

diff --git a/src/test/librados_test_stub/TestRadosClient.h b/src/test/librados_test_stub/TestRadosClient.h
index d32a5c1795862ade18142c1224ca30093db87841..cf4cf3555f3b58ee5487119576308bce1a15f6ad 100644 (file)
--- a/src/test/librados_test_stub/TestRadosClient.h
+++ b/src/test/librados_test_stub/TestRadosClient.h
@@ -64,6 +64,9 @@ public:
   virtual uint32_t get_nonce() = 0;
   virtual uint64_t get_instance_id() = 0;
 
+  virtual int get_min_compatible_client(int8_t* min_compat_client,
+                                        int8_t* require_min_compat_client) = 0;
+
   virtual int connect();
   virtual void shutdown();
   virtual int wait_for_latest_osdmap();