update sources to v12.1.1

[ceph.git] / ceph / src / test / erasure-code / TestErasureCodeIsa.cc

diff --git a/ceph/src/test/erasure-code/TestErasureCodeIsa.cc b/ceph/src/test/erasure-code/TestErasureCodeIsa.cc
index 40295cf4a6419ae322d83639d7a8e08abb3d4375..828349c6ca3e98f7e41a1a9fecdac599ae9a1876 100644 (file)
--- a/ceph/src/test/erasure-code/TestErasureCodeIsa.cc
+++ b/ceph/src/test/erasure-code/TestErasureCodeIsa.cc
@@ -874,7 +874,7 @@ TEST_F(IsaErasureCodeTest, isa_xor_codec)
   EXPECT_EQ(5, cnt_cf);
 }
 
-TEST_F(IsaErasureCodeTest, create_ruleset)
+TEST_F(IsaErasureCodeTest, create_rule)
 {
   CrushWrapper *c = new CrushWrapper;
   c->create();
@@ -913,9 +913,9 @@ TEST_F(IsaErasureCodeTest, create_ruleset)
     profile["m"] = "2";
     profile["w"] = "8";
     isa.init(profile, &cerr);
-    int ruleset = isa.create_ruleset("myrule", *c, &ss);
+    int ruleset = isa.create_rule("myrule", *c, &ss);
     EXPECT_EQ(0, ruleset);
-    EXPECT_EQ(-EEXIST, isa.create_ruleset("myrule", *c, &ss));
+    EXPECT_EQ(-EEXIST, isa.create_rule("myrule", *c, &ss));
     //
     // the minimum that is expected from the created ruleset is to
     // successfully map get_chunk_count() devices from the crushmap,
@@ -936,9 +936,9 @@ TEST_F(IsaErasureCodeTest, create_ruleset)
     profile["k"] = "2";
     profile["m"] = "2";
     profile["w"] = "8";
-    profile["ruleset-root"] = "BAD";
+    profile["crush-root"] = "BAD";
     isa.init(profile, &cerr);
-    EXPECT_EQ(-ENOENT, isa.create_ruleset("otherrule", *c, &ss));
+    EXPECT_EQ(-ENOENT, isa.create_rule("otherrule", *c, &ss));
     EXPECT_EQ("root item BAD does not exist", ss.str());
   }
   {
@@ -948,9 +948,9 @@ TEST_F(IsaErasureCodeTest, create_ruleset)
     profile["k"] = "2";
     profile["m"] = "2";
     profile["w"] = "8";
-    profile["ruleset-failure-domain"] = "WORSE";
+    profile["crush-failure-domain"] = "WORSE";
     isa.init(profile, &cerr);
-    EXPECT_EQ(-EINVAL, isa.create_ruleset("otherrule", *c, &ss));
+    EXPECT_EQ(-EINVAL, isa.create_rule("otherrule", *c, &ss));
     EXPECT_EQ("unknown type WORSE", ss.str());
   }
 }