mgr/dashboard : Optimized /host API to minimum resp

fixes : https://tracker.ceph.com/issues/72608

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>

diff --git a/src/pybind/mgr/dashboard/controllers/host.py b/src/pybind/mgr/dashboard/controllers/host.py
index ca15df5245c01fa835d5d06badfed81aa5810b3c..dbc8dfaa5c07675fa670dc5510c527647ce3805a 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/host.py
+++ b/src/pybind/mgr/dashboard/controllers/host.py
@@ -289,10 +289,27 @@ class Host(RESTController):
         if str_to_bool(facts):
             if orch.available():
                 if not orch.get_missing_features(['get_facts']):
+                    all_facts = orch.hosts.get_facts()
                     hosts_facts = []
+                    facts_map = {facts.get('hostname'): facts for facts in all_facts}
                     for host in hosts:
-                        facts = orch.hosts.get_facts(host['hostname'])[0]
-                        hosts_facts.append(facts)
+                        hostname = host['hostname']
+                        facts = facts_map.get(hostname, {})
+                        host_facts = {
+                            'hostname': facts.get('hostname', hostname),
+                            'addr': facts.get('addr', ''),
+                            'cpu_cores': facts.get('cpu_cores', 0),
+                            'cpu_count': facts.get('cpu_count', 0),
+                            'model': facts.get('model', ''),
+                            'memory_total_kb': facts.get('memory_total_kb', 0),
+                            'nic_count': facts.get('nic_count', 0),
+                            'hdd_count': facts.get('hdd_count', 0),
+                            'flash_count': facts.get('flash_count', 0),
+                            'hdd_capacity_bytes': facts.get('hdd_capacity_bytes', 0),
+                            'flash_capacity_bytes': facts.get('flash_capacity_bytes', 0)
+                        }
+                        hosts_facts.append(host_facts)
+
                     return merge_list_of_dicts_by_key(hosts, hosts_facts, 'hostname')
 
                 raise DashboardException(

diff --git a/src/pybind/mgr/dashboard/tests/test_host.py b/src/pybind/mgr/dashboard/tests/test_host.py
index 99fd6ce3d84b3b7bee171a0d8cd4b6b630ef76ea..aebfa0e31f643d9242c5feb64b631fc00ca86095 100644 (file)
--- a/src/pybind/mgr/dashboard/tests/test_host.py
+++ b/src/pybind/mgr/dashboard/tests/test_host.py
@@ -105,6 +105,14 @@ class HostControllerTest(ControllerTestCase):
                 'ceph': True,
                 'orchestrator': False
             },
+            'addr': '',
+            'cpu_cores': 0,
+            'model': '',
+            'nic_count': 0,
+            'hdd_count': 0,
+            'flash_count': 0,
+            'hdd_capacity_bytes': 0,
+            'flash_capacity_bytes': 0,
             'cpu_count': 1,
             'memory_total_kb': 1024,
             'services': [],
@@ -115,6 +123,14 @@ class HostControllerTest(ControllerTestCase):
                 'ceph': False,
                 'orchestrator': True
             },
+            'addr': '',
+            'cpu_cores': 0,
+            'model': '',
+            'nic_count': 0,
+            'hdd_count': 0,
+            'flash_count': 0,
+            'hdd_capacity_bytes': 0,
+            'flash_capacity_bytes': 0,
             'cpu_count': 2,
             'memory_total_kb': 1024,
             'services': [],
@@ -124,10 +140,12 @@ class HostControllerTest(ControllerTestCase):
         with patch_orch(True, hosts=hosts_without_facts) as fake_client:
             mock_get_hosts.return_value = hosts_without_facts
 
-            def get_facts_mock(hostname: str):
-                if hostname == 'host-0':
-                    return [hosts_facts[0]]
-                return [hosts_facts[1]]
+            def get_facts_mock(*args, **_kwargs):
+                if args:
+                    hostname = args[0]
+                    return [hosts_facts[0]] if hostname == 'host-0' else [hosts_facts[1]]
+                return hosts_facts
+
             fake_client.hosts.get_facts.side_effect = get_facts_mock
             # test with ?facts=true
             self._get('{}?facts=true'.format(self.URL_HOST), version=APIVersion(1, 3))