test/cli/crushtool: use straw2 buckets for choose-args test

Choose-args only works for straw2 so it is misleading to test using a
map with straw buckets.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7bfebfacfaf830fa9cb420b9d3e1d008e9891b3c)

diff --git a/src/test/cli/crushtool/choose-args.crush b/src/test/cli/crushtool/choose-args.crush
index 332f2e4f9a7108d66c3cc884e6a5c10933dec007..38eafe9a3558e6efeb6787fc14b992b6e511056e 100644 (file)
--- a/src/test/cli/crushtool/choose-args.crush
+++ b/src/test/cli/crushtool/choose-args.crush
@@ -15,28 +15,28 @@ type 3 root
 host host0 {
        id -1           # do not change unnecessarily
        # weight 1.000
-       alg straw
+       alg straw2
        hash 0  # rjenkins1
        item device0 weight 1.000
 }
 host host1 {
        id -2           # do not change unnecessarily
        # weight 1.000
-       alg straw
+       alg straw2
        hash 0  # rjenkins1
        item device1 weight 1.000
 }
 host host2 {
        id -5           # do not change unnecessarily
        # weight 1.000
-       alg straw
+       alg straw2
        hash 0  # rjenkins1
        item device2 weight 1.000
 }
 rack rack0 {
        id -3           # do not change unnecessarily
        # weight 3.000
-       alg straw
+       alg straw2
        hash 0  # rjenkins1
        item host0 weight 1.000
        item host1 weight 1.000
@@ -45,7 +45,7 @@ rack rack0 {
 root root {
        id -4           # do not change unnecessarily
        # weight 4.000
-       alg straw
+       alg straw2
        hash 0  # rjenkins1
        item rack0 weight 4.000
 }

diff --git a/src/test/cli/crushtool/choose-args.t b/src/test/cli/crushtool/choose-args.t
index dbe8e5bba7e6cac4fefece428c3b876b9ce7e3b0..1172aefb3ff2165c0e86881fdfd77edff0764419 100644 (file)
--- a/src/test/cli/crushtool/choose-args.t
+++ b/src/test/cli/crushtool/choose-args.t
@@ -45,7 +45,7 @@
               "type_id": 1,
               "type_name": "host",
               "weight": 65536,
-              "alg": "straw",
+              "alg": "straw2",
               "hash": "rjenkins1",
               "items": [
                   {
@@ -61,7 +61,7 @@
               "type_id": 1,
               "type_name": "host",
               "weight": 65536,
-              "alg": "straw",
+              "alg": "straw2",
               "hash": "rjenkins1",
               "items": [
                   {
@@ -77,7 +77,7 @@
               "type_id": 2,
               "type_name": "rack",
               "weight": 196608,
-              "alg": "straw",
+              "alg": "straw2",
               "hash": "rjenkins1",
               "items": [
                   {
@@ -103,7 +103,7 @@
               "type_id": 3,
               "type_name": "root",
               "weight": 262144,
-              "alg": "straw",
+              "alg": "straw2",
               "hash": "rjenkins1",
               "items": [
                   {
@@ -119,7 +119,7 @@
               "type_id": 1,
               "type_name": "host",
               "weight": 65536,
-              "alg": "straw",
+              "alg": "straw2",
               "hash": "rjenkins1",
               "items": [
                   {
@@ -167,13 +167,13 @@
           "profile": "argonaut",
           "optimal_tunables": 0,
           "legacy_tunables": 1,
-          "minimum_required_version": "argonaut",
+          "minimum_required_version": "hammer",
           "require_feature_tunables": 0,
           "require_feature_tunables2": 0,
           "has_v2_rules": 0,
           "require_feature_tunables3": 0,
           "has_v3_rules": 0,
-          "has_v4_buckets": 0,
+          "has_v4_buckets": 1,
           "require_feature_tunables5": 0,
           "has_v5_rules": 0
       },