From: Lenz Grimmer Date: Tue, 27 Mar 2018 09:45:54 +0000 (+0200) Subject: Merge pull request #21024 from s0nea/wip-dashboard-return-features-list X-Git-Tag: v13.1.0~494 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5e54fda5c91ccfca3de5c142614aa9601befbd9;p=ceph.git Merge pull request #21024 from s0nea/wip-dashboard-return-features-list mgr/dashboard: Convert the RBD feature names to a list of strings Reviewed-by: Ricardo Dias Reviewed-by: Ricardo Marques Reviewed-by: Stephan Müller --- d5e54fda5c91ccfca3de5c142614aa9601befbd9 diff --cc qa/tasks/mgr/dashboard/test_rbd.py index adb4aa46f12f,51968c23141f..ca0b1931feb1 --- a/qa/tasks/mgr/dashboard/test_rbd.py +++ b/qa/tasks/mgr/dashboard/test_rbd.py @@@ -70,14 -63,15 +70,15 @@@ class RbdTest(DashboardTestCase) self.assertEqual(rbd['num_objs'], 1) self.assertEqual(rbd['obj_size'], 4194304) self.assertEqual(rbd['features_name'], - 'deep-flatten, exclusive-lock, fast-diff, layering, object-map') + ['deep-flatten', 'exclusive-lock', 'fast-diff', 'layering', + 'object-map']) break - # TODO: Re-enable this test for bluestore cluster by figuring out how to skip none-bluestore - # ones automatically - @unittest.skip("requires bluestore cluster") @authenticate def test_create_rbd_in_data_pool(self): + if not self.bluestore_support: + self.skipTest('requires bluestore cluster') + self._ceph_cmd(['osd', 'pool', 'create', 'data_pool', '12', '12', 'erasure']) self._ceph_cmd(['osd', 'pool', 'application', 'enable', 'data_pool', 'rbd']) self._ceph_cmd(['osd', 'pool', 'set', 'data_pool', 'allow_ec_overwrites', 'true'])