test/librados: use connect_cluster_pp() instead of duplicating it

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/src/test/librados/test.cc b/src/test/librados/test.cc
index 30bb5b50c80cbd7c38d1bc588deda918ae970c9d..83f11b0b0b3a2d6e0270b910f35c2877c58d568e 100644 (file)
--- a/src/test/librados/test.cc
+++ b/src/test/librados/test.cc
@@ -45,32 +45,10 @@ std::string create_one_pool(const std::string &pool_name, rados_t *cluster)
 
 std::string create_one_pool_pp(const std::string &pool_name, Rados &cluster)
 {
-  char *id = getenv("CEPH_CLIENT_ID");
-  if (id) std::cerr << "Client id is: " << id << std::endl;
-
-  int ret;
-  ret = cluster.init(id);
-  if (ret) {
-    std::ostringstream oss;
-    oss << "cluster.init failed with error " << ret;
-    return oss.str();
-  }
-  ret = cluster.conf_read_file(NULL);
-  if (ret) {
-    cluster.shutdown();
-    std::ostringstream oss;
-    oss << "cluster.conf_read_file failed with error " << ret;
-    return oss.str();
-  }
-  cluster.conf_parse_env(NULL);
-  ret = cluster.connect();
-  if (ret) {
-    cluster.shutdown();
-    std::ostringstream oss;
-    oss << "cluster.connect failed with error " << ret;
-    return oss.str();
-  }
-  ret = cluster.pool_create(pool_name.c_str());
+  std::string err = connect_cluster_pp(cluster);
+  if (err.length())
+    return err;
+  int ret = cluster.pool_create(pool_name.c_str());
   if (ret) {
     cluster.shutdown();
     std::ostringstream oss;