]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/cephfs: don't hardcode data pool name in test_pool_perm
authorJohn Spray <john.spray@redhat.com>
Mon, 27 Jul 2015 22:30:36 +0000 (23:30 +0100)
committerJohn Spray <john.spray@redhat.com>
Tue, 28 Jul 2015 09:34:58 +0000 (10:34 +0100)
Signed-off-by: John Spray <john.spray@redhat.com>
tasks/cephfs/test_pool_perm.py

index a566f8630ee8d8ff18fb0f9603680ad0e54ec8f0..084d900a6ca058efa28dd03dd7e5af0202bdf16b 100644 (file)
@@ -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()