From 6864f882bc77acb3975e476d84d299b0e4b6b3ad Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 27 Jul 2015 23:30:36 +0100 Subject: [PATCH] tasks/cephfs: don't hardcode data pool name in test_pool_perm Signed-off-by: John Spray --- tasks/cephfs/test_pool_perm.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tasks/cephfs/test_pool_perm.py b/tasks/cephfs/test_pool_perm.py index a566f8630ee8d..084d900a6ca05 100644 --- a/tasks/cephfs/test_pool_perm.py +++ b/tasks/cephfs/test_pool_perm.py @@ -30,7 +30,7 @@ class TestPoolPerm(CephFSTestCase): # set data pool read only self.fs.mon_manager.raw_cluster_cmd_result('auth', 'caps', client_name, 'mon', 'allow r', 'osd', - 'allow r pool=data') + 'allow r pool={0}'.format(self.fs.get_data_pool_name())) self.mount_a.umount_wait() self.mount_a.mount() @@ -41,7 +41,7 @@ class TestPoolPerm(CephFSTestCase): # set data pool write only self.fs.mon_manager.raw_cluster_cmd_result('auth', 'caps', client_name, 'mon', 'allow r', 'osd', - 'allow w pool=data') + 'allow w pool={0}'.format(self.fs.get_data_pool_name())) self.mount_a.umount_wait() self.mount_a.mount() @@ -52,6 +52,7 @@ class TestPoolPerm(CephFSTestCase): def tearDown(self): self.fs.mon_manager.raw_cluster_cmd_result('auth', 'caps', "client.{0}".format(self.mount_a.client_id), - 'mon', 'allow r', 'osd', 'allow rw pool=data') + 'mon', 'allow r', 'osd', + 'allow rw pool={0}'.format(self.fs.get_data_pool_name())) super(CephFSTestCase, self).tearDown() -- 2.39.5