]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard: Fix host attributes like labels are not returned 36427/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, 3 Aug 2020 11:26:33 +0000 (19:26 +0800)
commit8f393f8e1bc2f5b20d2582aa48cefef23edc2153
treededabcd0969bc08c7443eb466e0283090983d8ff
parent6b727d2cb9b7bbdd9aad0d74ba238c7b1ba5fcc1
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>
src/pybind/mgr/dashboard/controllers/host.py
src/pybind/mgr/dashboard/tests/test_host.py