Skip to content

Commit 5104574

Browse files
authored
Merge pull request ceph#62716 from afreen23/wip-fix-empty-ver
mgr/dashboard: Fix empty ceph version in GET api/hosts Reviewed-by: Afreen Misbah <[email protected]> Reviewed-by: Aashish Sharma <[email protected]>
2 parents 5549c10 + 1aa74cf commit 5104574

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/pybind/mgr/dashboard/controllers/host.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def get_hosts(sources=None):
146146
hosts = [
147147
merge_dicts(
148148
{
149-
'ceph_version': '',
149+
'ceph_version': mgr.version,
150150
'services': [],
151151
'sources': {
152152
'ceph': False,

src/pybind/mgr/dashboard/tests/test_host.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ def test_get_2(self):
187187

188188
def test_get_3(self):
189189
mgr.list_servers.return_value = []
190+
mgr.version = 'ceph version 16.0.0-3151-gf202994fcf'
190191

191192
with patch_orch(True, hosts=[HostSpec('node1')]):
192193
self._get('{}/node1'.format(self.URL_HOST))
@@ -197,6 +198,7 @@ def test_get_3(self):
197198

198199
def test_populate_service_instances(self):
199200
mgr.list_servers.return_value = []
201+
mgr.version = 'ceph version 16.0.0-3151-gf202994fcf'
200202

201203
node1_daemons = [
202204
DaemonDescription(

0 commit comments

Comments
 (0)