From: Paul Cuzner <pcuzner@redhat.com>
Date: Tue, 2 Mar 2021 01:18:37 +0000 (+1300)
Subject: mgr/cephadm:fix to resolve mypy issue
X-Git-Tag: v16.2.0~106^2~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2ef8f4e55c052527b011dd02fe2839fdd2f0a82;p=ceph.git

mgr/cephadm:fix to resolve mypy issue

Build of ceph metadata needed addition type hints.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 14074887db099c7b9b4cf89ccad10f224453696c)
---

diff --git a/src/pybind/mgr/cephadm/configchecks.py b/src/pybind/mgr/cephadm/configchecks.py
index 5f69c007eae1..bb14bbc124ec 100644
--- a/src/pybind/mgr/cephadm/configchecks.py
+++ b/src/pybind/mgr/cephadm/configchecks.py
@@ -2,6 +2,8 @@ import json
 import ipaddress
 import logging
 
+from mgr_module import ServiceInfoT
+
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, cast, Tuple, Callable
 
 if TYPE_CHECKING:
@@ -347,13 +349,14 @@ class CephadmConfigChecks:
         service_map: Dict[str, Optional[Dict[str, str]]] = {}
 
         for server in self.mgr.list_servers():
-            for service in server.get('services', []):
-                service_map.update(
-                    {
-                        f"{service['type']}.{service['id']}":
-                        self.mgr.get_metadata(service['type'], service['id'])
-                    }
-                )
+            for service in cast(List[ServiceInfoT], server.get('services', [])):
+                if service:
+                    service_map.update(
+                        {
+                            f"{service['type']}.{service['id']}":
+                            self.mgr.get_metadata(service['type'], service['id'])
+                        }
+                    )
         return service_map
 
     def _check_kernel_lsm(self) -> None: