From: Sage Weil <sage@newdream.net>
Date: Tue, 16 Mar 2021 13:01:46 +0000 (-0500)
Subject: mgr/{prometheus,telemetry}: appease mypy
X-Git-Tag: v16.2.0~106^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5679f43a31b6bb07079ce59d9332a617e36dba82;p=ceph.git

mgr/{prometheus,telemetry}: appease mypy

update to adapt the type annotation of MgrModule.list_servers()

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 19abd1e1f47da14dbd2be89e15b04d483e75a105)

# Conflicts:
#	src/pybind/mgr/telemetry/module.py
  - drop telemetry portion
---

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index a0f2a5024e3..19c3f5f36c5 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -10,12 +10,12 @@ import re
 import socket
 import threading
 import time
-from mgr_module import MgrModule, MgrStandbyModule, PG_STATES, Option
+from mgr_module import MgrModule, MgrStandbyModule, PG_STATES, Option, ServiceInfoT
 from mgr_util import get_default_addr, profile_method
 from rbd import RBD
 from collections import namedtuple
 try:
-    from typing import DefaultDict, Optional, Dict, Any, Set, cast
+    from typing import DefaultDict, Optional, Dict, Any, List, Set, cast
 except ImportError:
     pass
 
@@ -717,7 +717,7 @@ class Module(MgrModule):
         for server in self.list_servers():
             version = server.get('ceph_version', '')
             host = server.get('hostname', '')
-            for service in server.get('services', []):
+            for service in cast(List[ServiceInfoT], server.get('services', [])):
                 ret.update({(service['id'], service['type']): (host, version)})
         return ret
 
@@ -1240,7 +1240,7 @@ class Module(MgrModule):
         targets = []
         for server in servers:
             hostname = server.get('hostname', '')
-            for service in server.get('services', []):
+            for service in cast(List[ServiceInfoT], server.get('services', [])):
                 if service['type'] != 'mgr':
                     continue
                 id_ = service['id']