From: Aashish Sharma <aashishsharma@localhost.localdomain>
Date: Thu, 1 Oct 2020 11:31:47 +0000 (+0530)
Subject: mgr/dashboard:Improvements in cluster > OSDs
X-Git-Tag: v16.1.0~660^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2df7bca459b9e540f8d748fefc2fdb4c7cc57e85;p=ceph.git

mgr/dashboard:Improvements in cluster > OSDs

Made osd-id the first column of the table instead of Host.

Fixes:https://tracker.ceph.com/issues/47478
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
index a0e61cb5db96..1c7a7ad098c6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
@@ -267,8 +267,8 @@ export class OsdListComponent extends ListWithDetails implements OnInit {
       }
     ];
     this.columns = [
-      { prop: 'host.name', name: $localize`Host` },
       { prop: 'id', name: $localize`ID`, flexGrow: 1, cellTransformation: CellTemplate.bold },
+      { prop: 'host.name', name: $localize`Host` },
       {
         prop: 'collectedStates',
         name: $localize`Status`,
diff --git a/src/pybind/mgr/dashboard/tests/test_cephfs.py b/src/pybind/mgr/dashboard/tests/test_cephfs.py
index f37741e50fdc..5c35cab329cd 100644
--- a/src/pybind/mgr/dashboard/tests/test_cephfs.py
+++ b/src/pybind/mgr/dashboard/tests/test_cephfs.py
@@ -4,9 +4,8 @@ from collections import defaultdict
 try:
     from mock import Mock
 except ImportError:
-    from unittest.mock import Mock
+    from unittest.mock import patch, Mock
 
-from .. import mgr
 from ..controllers.cephfs import CephFS
 from . import ControllerTestCase  # pylint: disable=no-name-in-module
 
@@ -25,16 +24,10 @@ def get_metadata_mock(key, meta_key):
     }[key]
 
 
+@patch('dashboard.mgr.get_metadata', Mock(side_effect=get_metadata_mock))
 class CephFsTest(ControllerTestCase):
     cephFs = CephFS()
 
-    @classmethod
-    def setup_server(cls):
-        mgr.get_metadata = Mock(side_effect=get_metadata_mock)
-
-    def tearDown(self):
-        mgr.get_metadata.stop()
-
     def test_append_of_mds_metadata_if_key_is_not_found(self):
         mds_versions = defaultdict(list)
         # pylint: disable=protected-access