]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21024 from s0nea/wip-dashboard-return-features-list
authorLenz Grimmer <lenz@grimmer.com>
Tue, 27 Mar 2018 09:45:54 +0000 (11:45 +0200)
committerGitHub <noreply@github.com>
Tue, 27 Mar 2018 09:45:54 +0000 (11:45 +0200)
mgr/dashboard: Convert the RBD feature names to a list of strings

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
1  2 
qa/tasks/mgr/dashboard/test_rbd.py
src/pybind/mgr/dashboard/controllers/rbd.py

index adb4aa46f12f3377889be6a9eba9e9a5598c52e0,51968c23141fdac21e3230a0dbea4126df2bb252..ca0b1931feb144e5d954695ee90c3ed08e092d86
@@@ -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'])