From: Sage Weil <sage@redhat.com>
Date: Sat, 17 Jan 2015 01:23:34 +0000 (-0800)
Subject: crushtool: fix cli tests for new tree output
X-Git-Tag: v0.93~227^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a0d1241246e73e36706188d2789874bf8d1ae3f;p=ceph.git

crushtool: fix cli tests for new tree output

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
index f01673704f4c..4b98b3cbaff0 100644
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -5,19 +5,19 @@
 #
   $ crushtool --outfn "$map" --build --num_osds 5 node straw 2 rack straw 1 root straw 0
   .* (re)
-  # id\tweight\ttype name\treweight (esc)
-  -7\t5\troot root (esc)
-  -4\t2\t\track rack0 (esc)
-  -1\t2\t\t\tnode node0 (esc)
-  0\t1\t\t\t\tosd.0\t1\t (esc)
-  1\t1\t\t\t\tosd.1\t1\t (esc)
-  -5\t2\t\track rack1 (esc)
-  -2\t2\t\t\tnode node1 (esc)
-  2\t1\t\t\t\tosd.2\t1\t (esc)
-  3\t1\t\t\t\tosd.3\t1\t (esc)
-  -6\t1\t\track rack2 (esc)
-  -3\t1\t\t\tnode node2 (esc)
-  4\t1\t\t\t\tosd.4\t1\t (esc)
+  ID\tWEIGHT\tTYPE NAME (esc)
+  -7\t5.00000\troot root (esc)
+  -4\t2.00000\t\track rack0 (esc)
+  -1\t2.00000\t\t\tnode node0 (esc)
+  0\t1.00000\t\t\t\tosd.0 (esc)
+  1\t1.00000\t\t\t\tosd.1 (esc)
+  -5\t2.00000\t\track rack1 (esc)
+  -2\t2.00000\t\t\tnode node1 (esc)
+  2\t1.00000\t\t\t\tosd.2 (esc)
+  3\t1.00000\t\t\t\tosd.3 (esc)
+  -6\t1.00000\t\track rack2 (esc)
+  -3\t1.00000\t\t\tnode node2 (esc)
+  4\t1.00000\t\t\t\tosd.4 (esc)
   
 
 #  
@@ -30,18 +30,18 @@
 #
   $ crushtool --outfn "$map" --build --num_osds 5 node straw 2 rack straw 1 
   .* (re)
-  # id\tweight\ttype name\treweight (esc)
-  -6\t1\track rack2 (esc)
-  -3\t1\t\tnode node2 (esc)
-  4\t1\t\t\tosd.4\t1\t (esc)
-  -5\t2\track rack1 (esc)
-  -2\t2\t\tnode node1 (esc)
-  2\t1\t\t\tosd.2\t1\t (esc)
-  3\t1\t\t\tosd.3\t1\t (esc)
-  -4\t2\track rack0 (esc)
-  -1\t2\t\tnode node0 (esc)
-  0\t1\t\t\tosd.0\t1\t (esc)
-  1\t1\t\t\tosd.1\t1\t (esc)
+  ID\tWEIGHT\tTYPE NAME (esc)
+  -6\t1.00000\track rack2 (esc)
+  -3\t1.00000\t\tnode node2 (esc)
+  4\t1.00000\t\t\tosd.4 (esc)
+  -5\t2.00000\track rack1 (esc)
+  -2\t2.00000\t\tnode node1 (esc)
+  2\t1.00000\t\t\tosd.2 (esc)
+  3\t1.00000\t\t\tosd.3 (esc)
+  -4\t2.00000\track rack0 (esc)
+  -1\t2.00000\t\tnode node0 (esc)
+  0\t1.00000\t\t\tosd.0 (esc)
+  1\t1.00000\t\t\tosd.1 (esc)
   
   .* The crush rulesets will use the root rack0 (re)
   and ignore the others.