From: Ricardo Marques <rimarques@suse.com>
Date: Fri, 8 Jun 2018 10:57:38 +0000 (+0100)
Subject: mgr/dashboard: Summary endpoint should return ceph version
X-Git-Tag: v14.0.1~1117^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a97991d48011ccd320ad6f05cae269daf7366ecd;p=ceph.git

mgr/dashboard: Summary endpoint should return ceph version

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

diff --git a/qa/tasks/mgr/dashboard/test_summary.py b/qa/tasks/mgr/dashboard/test_summary.py
index 065e59db03d78..1bea22e09c18f 100644
--- a/qa/tasks/mgr/dashboard/test_summary.py
+++ b/qa/tasks/mgr/dashboard/test_summary.py
@@ -17,6 +17,7 @@ class SummaryTest(DashboardTestCase):
         self.assertIn('rbd_mirroring', data)
         self.assertIn('executing_tasks', data)
         self.assertIn('finished_tasks', data)
+        self.assertIn('version', data)
         self.assertIsNotNone(data['health_status'])
         self.assertIsNotNone(data['mgr_id'])
         self.assertIsNotNone(data['have_mon_connection'])
diff --git a/src/pybind/mgr/dashboard/controllers/summary.py b/src/pybind/mgr/dashboard/controllers/summary.py
index f0e57efcb703f..d01ee1d1e33e9 100644
--- a/src/pybind/mgr/dashboard/controllers/summary.py
+++ b/src/pybind/mgr/dashboard/controllers/summary.py
@@ -49,5 +49,6 @@ class Summary(BaseController):
             'mgr_id': mgr.get_mgr_id(),
             'have_mon_connection': mgr.have_mon_connection(),
             'executing_tasks': executing_t,
-            'finished_tasks': finished_t
+            'finished_tasks': finished_t,
+            'version': mgr.version
         }
diff --git a/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py b/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
index 479b133e0477b..99ca8521e7f0a 100644
--- a/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
+++ b/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
@@ -59,6 +59,9 @@ class RbdMirroringControllerTest(ControllerTestCase):
         mgr.url_prefix = ''
         mgr.get_mgr_id.return_value = 0
         mgr.have_mon_connection.return_value = True
+        mgr.version = 'ceph version 13.1.0-534-g23d3751b89 ' \
+                      '(23d3751b897b31d2bda57aeaf01acb5ff3c4a9cd) ' \
+                      'nautilus (dev)'
 
         RbdMirror._cp_config['tools.authenticate.on'] = False  # pylint: disable=protected-access