]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test/rgw: updated test_rgw_crypto to use rgw_raw_obj
authorCasey Bodley <cbodley@redhat.com>
Fri, 10 Mar 2017 20:40:20 +0000 (15:40 -0500)
committerAdam Kupczyk <akupczyk@mirantis.com>
Wed, 5 Apr 2017 16:31:58 +0000 (18:31 +0200)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/test/rgw/test_rgw_crypto.cc

index 6a3994f10adad19e7ad21f239946043e899a387b..b0464974d097201dc31b887a13d6d3d1ec8064f9 100644 (file)
@@ -50,13 +50,13 @@ class ut_put_sink: public RGWPutObjDataProcessor
 public:
   ut_put_sink(){}
   virtual ~ut_put_sink(){}
-  int handle_data(bufferlist& bl, off_t ofs, void **phandle, rgw_obj *pobj, bool *again) override
+  int handle_data(bufferlist& bl, off_t ofs, void **phandle, rgw_raw_obj *pobj, bool *again) override
   {
     sink << boost::string_ref(bl.c_str(),bl.length());
     *again = false;
     return 0;
   }
-  int throttle_data(void *handle, const rgw_obj& obj, uint64_t size, bool need_to_wait) override
+  int throttle_data(void *handle, const rgw_raw_obj& obj, uint64_t size, bool need_to_wait) override
   {
     return 0;
   }
@@ -564,7 +564,7 @@ TEST(TestRGWCrypto, verify_RGWPutObj_BlockEncrypt_chunks)
       bl.append(input.c_str()+pos, size);
       void* handle;
       bool again = false;
-      rgw_obj ro;
+      rgw_raw_obj ro;
       encrypt.handle_data(bl, 0, &handle, nullptr, &again);
       encrypt.throttle_data(handle, ro, size, false);
 
@@ -621,7 +621,7 @@ TEST(TestRGWCrypto, verify_Encrypt_Decrypt)
     bl.append((char*)test_in, test_size);
     void* handle;
     bool again = false;
-    rgw_obj ro;
+    rgw_raw_obj ro;
     encrypt.handle_data(bl, 0, &handle, nullptr, &again);
     encrypt.throttle_data(handle, ro, test_size, false);
     bl.clear();