From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 19 Nov 2014 22:17:03 +0000 (+0100)
Subject: ceph_objectstore_tool: use CephManager::get_pool_dump
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a26b0f0c93fe719d43d7db860c2008cb86bd509f;p=ceph.git

ceph_objectstore_tool: use CephManager::get_pool_dump

Instead of custom made get_pool_id function.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 2b57f4c59c045b042c779ffe384fdcccf9a6ddb4)
---

diff --git a/tasks/ceph_objectstore_tool.py b/tasks/ceph_objectstore_tool.py
index 4ea6ad255f10..c89413fd53c1 100644
--- a/tasks/ceph_objectstore_tool.py
+++ b/tasks/ceph_objectstore_tool.py
@@ -27,12 +27,7 @@ FSPATH = "/var/lib/ceph/osd/ceph-{id}"
 JPATH = "/var/lib/ceph/osd/ceph-{id}/journal"
 
 
-def get_pool_id(ctx, name):
-    return ctx.manager.raw_cluster_cmd('osd', 'pool', 'stats', name).split()[3]
-
-
 def cod_setup_local_data(log, ctx, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT):
-
     objects = range(1, NUM_OBJECTS + 1)
     for i in objects:
         NAME = BASE_NAME + "{num}".format(num=i)
@@ -234,7 +229,8 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME):
     NUM_OBJECTS = config.get('objects', 10)
     log.info("objects: {num}".format(num=NUM_OBJECTS))
 
-    REPID = get_pool_id(ctx, REP_POOL)
+    pool_dump = manager.get_pool_dump(REP_POOL)
+    REPID = pool_dump['pool']
 
     log.debug("repid={num}".format(num=REPID))