test/rgw: api fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_zone.h b/src/rgw/rgw_zone.h
index 3b4a4d0b668a12dff60888cc05ea8f26457853f6..a7a1d13dfac57c12009872e374b4f1f636127a7b 100644 (file)
--- a/src/rgw/rgw_zone.h
+++ b/src/rgw/rgw_zone.h
@@ -313,6 +313,9 @@ struct RGWZonePlacementInfo {
 
     return storage_class->data_pool.get_value_or(no_pool);
   }
+  const rgw_pool& get_standard_data_pool() const {
+    return get_data_pool(RGW_STORAGE_CLASS_STANDARD);
+  }
 
   const string& get_compression_type(const string& sc) const {
     const RGWZoneStorageClass *storage_class;

diff --git a/src/test/rgw/test_rgw_common.cc b/src/test/rgw/test_rgw_common.cc
index d4bba3584bad9e9b8ac38062d40e6b07c3433e3d..731d624e2c22107dd62cf5c0f51d36b494c7090c 100644 (file)
--- a/src/test/rgw/test_rgw_common.cc
+++ b/src/test/rgw/test_rgw_common.cc
@@ -6,11 +6,13 @@ void test_rgw_add_placement(RGWZoneGroup *zonegroup, RGWZoneParams *zone_params,
 
   RGWZonePlacementInfo& pinfo = zone_params->placement_pools[name];
   pinfo.index_pool = rgw_pool(name + ".index").to_str();
-  pinfo.data_pool = rgw_pool(name + ".data").to_str();
+
+  rgw_pool data_pool(name + ".data");
+  pinfo.storage_classes.set_storage_class(RGW_STORAGE_CLASS_STANDARD, &data_pool, nullptr);
   pinfo.data_extra_pool = rgw_pool(name + ".extra").to_str();
-  
+
   if (is_default) {
-    zonegroup->default_placement = name;
+    zonegroup->default_placement = rgw_placement_rule(name, RGW_STORAGE_CLASS_STANDARD);
   }
 }
 

diff --git a/src/test/rgw/test_rgw_common.h b/src/test/rgw/test_rgw_common.h
index 0fc4d5f4e2abd976d0c284663aabbc3f1c18b00b..c360e3b0ad5036ad534c3d474e2f9a393146ae46 100644 (file)
--- a/src/test/rgw/test_rgw_common.h
+++ b/src/test/rgw/test_rgw_common.h
@@ -468,15 +468,15 @@ struct test_rgw_env {
 
   test_rgw_env() {
     test_rgw_init_env(&zonegroup, &zone_params);
-    default_placement.data_pool = rgw_pool(zone_params.placement_pools[zonegroup.default_placement].data_pool);
-    default_placement.data_extra_pool =  rgw_pool(zone_params.placement_pools[zonegroup.default_placement].data_extra_pool);
+    default_placement.data_pool = rgw_pool(zone_params.placement_pools[zonegroup.default_placement.name].get_standard_data_pool());
+    default_placement.data_extra_pool =  rgw_pool(zone_params.placement_pools[zonegroup.default_placement.name].data_extra_pool);
   }
 
   rgw_data_placement_target get_placement(const std::string& placement_id) {
     const RGWZonePlacementInfo& pi = zone_params.placement_pools[placement_id];
     rgw_data_placement_target pt;
     pt.index_pool = pi.index_pool;
-    pt.data_pool = pi.data_pool;
+    pt.data_pool = pi.get_standard_data_pool();
     pt.data_extra_pool = pi.data_extra_pool;
     return pt;
   }

diff --git a/src/test/rgw/test_rgw_manifest.cc b/src/test/rgw/test_rgw_manifest.cc
index 57a7ff323d6696ed59030cd621955fea87dc01db..bb6f8241275d921808f79bbe982906b358e04501 100644 (file)
--- a/src/test/rgw/test_rgw_manifest.cc
+++ b/src/test/rgw/test_rgw_manifest.cc
@@ -128,7 +128,7 @@ void append_stripes(list<rgw_obj> *objs, RGWObjManifest& manifest, uint64_t obj_
 }
 
 static void gen_obj(test_rgw_env& env, uint64_t obj_size, uint64_t head_max_size, uint64_t stripe_size,
-                    RGWObjManifest *manifest, const string& placement_id, rgw_bucket *bucket, rgw_obj *head, RGWObjManifest::generator *gen,
+                    RGWObjManifest *manifest, const rgw_placement_rule& placement_rule, rgw_bucket *bucket, rgw_obj *head, RGWObjManifest::generator *gen,
                     list<rgw_obj> *test_objs)
 {
   manifest->set_trivial_rule(head_max_size, stripe_size);
@@ -136,7 +136,7 @@ static void gen_obj(test_rgw_env& env, uint64_t obj_size, uint64_t head_max_size
   test_rgw_init_bucket(bucket, "buck");
 
   *head = rgw_obj(*bucket, "oid");
-  gen->create_begin(g_ceph_context, manifest, placement_id, *bucket, *head);
+  gen->create_begin(g_ceph_context, manifest, placement_rule, nullptr, *bucket, *head);
 
   append_head(test_objs, *head);
   cout << "test_objs.size()=" << test_objs->size() << std::endl;
@@ -313,7 +313,8 @@ TEST(TestRGWManifest, multipart) {
     rgw_obj head;
     for (ofs = 0; ofs < part_size; ofs += stripe_size) {
       if (ofs == 0) {
-        int r = gen.create_begin(g_ceph_context, &manifest, env.zonegroup.default_placement, bucket, head);
+        rgw_placement_rule rule(env.zonegroup.default_placement.name, RGW_STORAGE_CLASS_STANDARD);
+        int r = gen.create_begin(g_ceph_context, &manifest, rule, nullptr, bucket, head);
         ASSERT_EQ(r, 0);
         continue;
       }

diff --git a/src/test/rgw/test_rgw_obj.cc b/src/test/rgw/test_rgw_obj.cc
index ad8ef6956630228cd9d6541151feb5fb75afd7dc..7b88d63111d1cf45c744554d81d131ee62a604d8 100644 (file)
--- a/src/test/rgw/test_rgw_obj.cc
+++ b/src/test/rgw/test_rgw_obj.cc
@@ -200,7 +200,7 @@ TEST(TestRGWObj, obj_to_raw) {
   for (auto name : { "myobj", "_myobj", "_myobj_"}) {
     for (auto inst : { "", "inst"}) {
       for (auto ns : { "", "ns"}) {
-        test_obj_to_raw(env, b, name, inst, ns, env.zonegroup.default_placement);
+        test_obj_to_raw(env, b, name, inst, ns, env.zonegroup.default_placement.name);
         test_obj_to_raw(env, eb, name, inst, ns, string());
       }
     }