test/d4n: Add dout initalization during env setup

Signed-off-by: Samarah <samarah.uriarte@ibm.com>

diff --git a/src/test/rgw/test_d4n_policy.cc b/src/test/rgw/test_d4n_policy.cc
index 04ece864e7fb829ce4e62da5adce3523fe7b94b3..eb1f6f42c8a821db03feccff0836486c1b1e07f1 100644 (file)
--- a/src/test/rgw/test_d4n_policy.cc
+++ b/src/test/rgw/test_d4n_policy.cc
@@ -27,14 +27,13 @@ class Environment : public ::testing::Environment {
 
     void SetUp() override {
       std::vector<const char*> args;
-      std::string conf_file_list;
-      std::string cluster = "";
-      CephInitParameters iparams = ceph_argparse_early_args(
-       args, CEPH_ENTITY_TYPE_CLIENT,
-       &cluster, &conf_file_list);
+      auto _cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
+                             CODE_ENVIRONMENT_UTILITY,
+                             CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
 
-      cct = common_preinit(iparams, CODE_ENVIRONMENT_UTILITY, {}); 
+      cct = _cct.get();
       dpp = new DoutPrefix(cct->get(), dout_subsys, "D4N Object Directory Test: ");
+      common_init_finish(g_ceph_context);
       
       redisHost = cct->_conf->rgw_d4n_address; 
     }

diff --git a/src/test/rgw/test_ssd_driver.cc b/src/test/rgw/test_ssd_driver.cc
index e0cdace51a2526938711a12ebc6611d64a8ab6b4..1ab3009acc2e1cb6c057f13f8afb634e0c740240 100644 (file)
--- a/src/test/rgw/test_ssd_driver.cc
+++ b/src/test/rgw/test_ssd_driver.cc
@@ -70,14 +70,13 @@ class Environment : public ::testing::Environment {
 
     void SetUp() override {
       std::vector<const char*> args;
-      std::string conf_file_list;
-      std::string cluster = "";
-      CephInitParameters iparams = ceph_argparse_early_args(
-        args, CEPH_ENTITY_TYPE_CLIENT,
-        &cluster, &conf_file_list);
+      auto _cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
+                             CODE_ENVIRONMENT_UTILITY,
+                             CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
 
-      cct = common_preinit(iparams, CODE_ENVIRONMENT_UTILITY, {});
+      cct = _cct.get();
       dpp = new DoutPrefix(cct->get(), dout_subsys, "SSD backed Cache backend Test: ");
+      common_init_finish(g_ceph_context);
     }
 
     CephContext* cct;
@@ -291,4 +290,4 @@ int main(int argc, char *argv[]) {
   ::testing::AddGlobalTestEnvironment(env);
 
   return RUN_ALL_TESTS();
-}
\ No newline at end of file
+}