From 31ad70d8f11e4509a8e134a1101792e3b78323f7 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Wed, 18 Mar 2020 20:03:59 +0800 Subject: [PATCH] mgr/test_orchestrator: fix service filtering when using dummy data Signed-off-by: Kiefer Chang --- src/pybind/mgr/test_orchestrator/module.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/test_orchestrator/module.py b/src/pybind/mgr/test_orchestrator/module.py index 10fa8482e6ba6..db751cb84dd77 100644 --- a/src/pybind/mgr/test_orchestrator/module.py +++ b/src/pybind/mgr/test_orchestrator/module.py @@ -197,17 +197,23 @@ class TestOrchestrator(MgrModule, orchestrator.Orchestrator): if self._services: # Dummy data services = self._services + # Can't deduce service type from dummy data (no daemons). + # Assume service_type is service_name. + if service_type is not None: + services = list(filter(lambda s: s.service_name == service_type, services)) else: # Deduce services from daemons running on localhost all_daemons = self._get_ceph_daemons() services = [] for daemon_type, daemons in itertools.groupby(all_daemons, key=lambda d: d.daemon_type): + if service_type is not None and service_type != daemon_type: + continue daemon_size = len(list(daemons)) services.append(orchestrator.ServiceDescription( service_name=daemon_type, size=daemon_size, running=daemon_size)) def _filter_func(svc): - if service_type is not None and service_type != svc.service_name: + if service_name is not None and service_name != svc.service_name: return False return True -- 2.39.5