]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f6091e8) | patch
mgr/dashboard: Fix host attributes like labels are not returned 36678/head
authorKiefer Chang <kiefer.chang@suse.com>
Mon, 3 Aug 2020 11:20:08 +0000 (19:20 +0800)
committerKiefer Chang <kiefer.chang@suse.com>
Mon, 17 Aug 2020 06:54:18 +0000 (14:54 +0800)
commit0e6b623572ff99c28428465b4f6a51cfe60d446a
tree38c688ec0320433af18ecf2bdc0e068874ef7e5etree | snapshot
parentf6091e8f7076e74420a3a65cebb69faaddc0af34commit | diff
mgr/dashboard: Fix host attributes like labels are not returned

The problem only happens when a host is reported both from Ceph and the
Orchestrator. There is an error on merging Ceph hosts with Orchestrator
hosts. The unit test is refined to test this case.

Fixes: https://tracker.ceph.com/issues/46761
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 8f393f8e1bc2f5b20d2582aa48cefef23edc2153)
src/pybind/mgr/dashboard/controllers/host.py diff | blob | history
src/pybind/mgr/dashboard/tests/test_host.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.