update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / librados_test_stub / TestRadosClient.h

diff --git a/ceph/src/test/librados_test_stub/TestRadosClient.h b/ceph/src/test/librados_test_stub/TestRadosClient.h
index 835ebd12ee51b33834132b1ca8abdd567fef5530..993382f7b9823646eef980fe1d39f2b76421cd10 100644 (file)
--- a/ceph/src/test/librados_test_stub/TestRadosClient.h
+++ b/ceph/src/test/librados_test_stub/TestRadosClient.h
@@ -42,15 +42,17 @@ public:
 
   class Transaction {
   public:
-    Transaction(TestRadosClient *rados_client, const std::string &oid)
-      : rados_client(rados_client), oid(oid) {
-      rados_client->transaction_start(oid);
+    Transaction(TestRadosClient *rados_client, const std::string& nspace,
+                const std::string &oid)
+      : rados_client(rados_client), nspace(nspace), oid(oid) {
+      rados_client->transaction_start(nspace, oid);
     }
     ~Transaction() {
-      rados_client->transaction_finish(oid);
+      rados_client->transaction_finish(nspace, oid);
     }
   private:
     TestRadosClient *rados_client;
+    std::string nspace;
     std::string oid;
   };
 
@@ -64,6 +66,10 @@ public:
   virtual uint32_t get_nonce() = 0;
   virtual uint64_t get_instance_id() = 0;
 
+  virtual int get_min_compatible_osd(int8_t* require_osd_release) = 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();
@@ -81,7 +87,7 @@ public:
   virtual int service_daemon_register(const std::string& service,
                                       const std::string& name,
                                       const std::map<std::string,std::string>& metadata) = 0;
-  virtual int service_daemon_update_status(const std::map<std::string,std::string>& status) = 0;
+  virtual int service_daemon_update_status(std::map<std::string,std::string>&& status) = 0;
 
   virtual int pool_create(const std::string &pool_name) = 0;
   virtual int pool_delete(const std::string &pool_name) = 0;
@@ -114,8 +120,10 @@ public:
 protected:
   virtual ~TestRadosClient();
 
-  virtual void transaction_start(const std::string &oid) = 0;
-  virtual void transaction_finish(const std::string &oid) = 0;
+  virtual void transaction_start(const std::string& nspace,
+                                 const std::string &oid) = 0;
+  virtual void transaction_finish(const std::string& nspace,
+                                  const std::string &oid) = 0;
 
 private: