From: Ricardo Marques <rimarques@suse.com>
Date: Mon, 23 Apr 2018 21:15:48 +0000 (+0100)
Subject: mgr/dashboard: Add RBD default features REST API endpoint
X-Git-Tag: v13.1.0~92^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eeb87d3e4270449bf06fe522ba7292e51cf3afa9;p=ceph.git

mgr/dashboard: Add RBD default features REST API endpoint

Signed-off-by: Ricardo Marques <rimarques@suse.com>
---

diff --git a/qa/tasks/mgr/dashboard/test_rbd.py b/qa/tasks/mgr/dashboard/test_rbd.py
index 1d5164b6ad3..85ffa01a47c 100644
--- a/qa/tasks/mgr/dashboard/test_rbd.py
+++ b/qa/tasks/mgr/dashboard/test_rbd.py
@@ -537,3 +537,9 @@ class RbdTest(DashboardTestCase):
 
         self.remove_image('rbd_iscsi', 'img1_snapf_clone')
         self.assertStatus(204)
+
+    def test_default_features(self):
+        default_features = self._get('/api/block/image/default_features')
+        self.assertEqual(default_features, ['deep-flatten', 'exclusive-lock',
+                                             'fast-diff', 'layering',
+                                             'object-map'])
diff --git a/src/pybind/mgr/dashboard/controllers/rbd.py b/src/pybind/mgr/dashboard/controllers/rbd.py
index 1642b3b6bc7..8fa5abca18a 100644
--- a/src/pybind/mgr/dashboard/controllers/rbd.py
+++ b/src/pybind/mgr/dashboard/controllers/rbd.py
@@ -361,6 +361,11 @@ class Rbd(RESTController):
 
         return _rbd_image_call(pool_name, image_name, _flatten)
 
+    @RESTController.collection(['GET'])
+    def default_features(self):
+        rbd_default_features = mgr.get('config')['rbd_default_features']
+        return _format_bitmask(int(rbd_default_features))
+
 
 @ApiController('block/image/:pool_name/:image_name/snap')
 @AuthRequired()