X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fceph%2Fsrc%2Ftest%2Fcli%2Fcrushtool%2Fchoose-args.t;fp=src%2Fceph%2Fsrc%2Ftest%2Fcli%2Fcrushtool%2Fchoose-args.t;h=0000000000000000000000000000000000000000;hb=7da45d65be36d36b880cc55c5036e96c24b53f00;hp=dbe8e5bba7e6cac4fefece428c3b876b9ce7e3b0;hpb=691462d09d0987b47e112d6ee8740375df3c51b2;p=stor4nfv.git

diff --git a/src/ceph/src/test/cli/crushtool/choose-args.t b/src/ceph/src/test/cli/crushtool/choose-args.t
deleted file mode 100644
index dbe8e5b..0000000
--- a/src/ceph/src/test/cli/crushtool/choose-args.t
+++ /dev/null
@@ -1,279 +0,0 @@
-  $ cp "$TESTDIR/choose-args.crush" .
-  $ crushtool -c choose-args.crush -o choose-args.compiled
-  $ crushtool -d choose-args.compiled -o choose-args.conf
-  $ crushtool -c choose-args.conf -o choose-args.recompiled
-  $ cmp choose-args.crush choose-args.conf
-  $ cmp choose-args.compiled choose-args.recompiled
-  $ crushtool -c choose-args.conf -o /dev/null --dump
-  {
-      "devices": [
-          {
-              "id": 0,
-              "name": "device0"
-          },
-          {
-              "id": 1,
-              "name": "device1"
-          },
-          {
-              "id": 2,
-              "name": "device2"
-          }
-      ],
-      "types": [
-          {
-              "type_id": 0,
-              "name": "device"
-          },
-          {
-              "type_id": 1,
-              "name": "host"
-          },
-          {
-              "type_id": 2,
-              "name": "rack"
-          },
-          {
-              "type_id": 3,
-              "name": "root"
-          }
-      ],
-      "buckets": [
-          {
-              "id": -1,
-              "name": "host0",
-              "type_id": 1,
-              "type_name": "host",
-              "weight": 65536,
-              "alg": "straw",
-              "hash": "rjenkins1",
-              "items": [
-                  {
-                      "id": 0,
-                      "weight": 65536,
-                      "pos": 0
-                  }
-              ]
-          },
-          {
-              "id": -2,
-              "name": "host1",
-              "type_id": 1,
-              "type_name": "host",
-              "weight": 65536,
-              "alg": "straw",
-              "hash": "rjenkins1",
-              "items": [
-                  {
-                      "id": 1,
-                      "weight": 65536,
-                      "pos": 0
-                  }
-              ]
-          },
-          {
-              "id": -3,
-              "name": "rack0",
-              "type_id": 2,
-              "type_name": "rack",
-              "weight": 196608,
-              "alg": "straw",
-              "hash": "rjenkins1",
-              "items": [
-                  {
-                      "id": -1,
-                      "weight": 65536,
-                      "pos": 0
-                  },
-                  {
-                      "id": -2,
-                      "weight": 65536,
-                      "pos": 1
-                  },
-                  {
-                      "id": -5,
-                      "weight": 65536,
-                      "pos": 2
-                  }
-              ]
-          },
-          {
-              "id": -4,
-              "name": "root",
-              "type_id": 3,
-              "type_name": "root",
-              "weight": 262144,
-              "alg": "straw",
-              "hash": "rjenkins1",
-              "items": [
-                  {
-                      "id": -3,
-                      "weight": 262144,
-                      "pos": 0
-                  }
-              ]
-          },
-          {
-              "id": -5,
-              "name": "host2",
-              "type_id": 1,
-              "type_name": "host",
-              "weight": 65536,
-              "alg": "straw",
-              "hash": "rjenkins1",
-              "items": [
-                  {
-                      "id": 2,
-                      "weight": 65536,
-                      "pos": 0
-                  }
-              ]
-          }
-      ],
-      "rules": [
-          {
-              "rule_id": 3,
-              "rule_name": "data",
-              "ruleset": 3,
-              "type": 1,
-              "min_size": 2,
-              "max_size": 2,
-              "steps": [
-                  {
-                      "op": "take",
-                      "item": -4,
-                      "item_name": "root"
-                  },
-                  {
-                      "op": "chooseleaf_firstn",
-                      "num": 0,
-                      "type": "rack"
-                  },
-                  {
-                      "op": "emit"
-                  }
-              ]
-          }
-      ],
-      "tunables": {
-          "choose_local_tries": 2,
-          "choose_local_fallback_tries": 5,
-          "choose_total_tries": 19,
-          "chooseleaf_descend_once": 0,
-          "chooseleaf_vary_r": 0,
-          "chooseleaf_stable": 0,
-          "straw_calc_version": 0,
-          "allowed_bucket_algs": 22,
-          "profile": "argonaut",
-          "optimal_tunables": 0,
-          "legacy_tunables": 1,
-          "minimum_required_version": "argonaut",
-          "require_feature_tunables": 0,
-          "require_feature_tunables2": 0,
-          "has_v2_rules": 0,
-          "require_feature_tunables3": 0,
-          "has_v3_rules": 0,
-          "has_v4_buckets": 0,
-          "require_feature_tunables5": 0,
-          "has_v5_rules": 0
-      },
-      "choose_args": {
-          "1": [],
-          "2": [
-              {
-                  "bucket_id": -3,
-                  "ids": [
-                      -20,
-                      30,
-                      -25
-                  ]
-              }
-          ],
-          "3": [
-              {
-                  "bucket_id": -3,
-                  "weight_set": [
-                      [
-                          1.000000,
-                          2.000000,
-                          5.000000
-                      ],
-                      [
-                          3.000000,
-                          2.000000,
-                          5.000000
-                      ]
-                  ],
-                  "ids": [
-                      -20,
-                      -30,
-                      -25
-                  ]
-              }
-          ],
-          "4": [
-              {
-                  "bucket_id": -2,
-                  "weight_set": [
-                      [
-                          1.000000
-                      ],
-                      [
-                          3.000000
-                      ]
-                  ]
-              }
-          ],
-          "5": [
-              {
-                  "bucket_id": -1,
-                  "ids": [
-                      -450
-                  ]
-              }
-          ],
-          "6": [
-              {
-                  "bucket_id": -1,
-                  "ids": [
-                      -450
-                  ]
-              },
-              {
-                  "bucket_id": -2,
-                  "weight_set": [
-                      [
-                          1.000000
-                      ],
-                      [
-                          3.000000
-                      ]
-                  ]
-              },
-              {
-                  "bucket_id": -3,
-                  "weight_set": [
-                      [
-                          1.000000,
-                          2.000000,
-                          5.000000
-                      ],
-                      [
-                          3.000000,
-                          2.000000,
-                          5.000000
-                      ]
-                  ],
-                  "ids": [
-                      -20,
-                      -30,
-                      -25
-                  ]
-              }
-          ]
-      }
-  }
-  
-
-  $ crushtool -c choose-args.conf -o /dev/null --dump | jq .for_json_validation
-  null