From 2bcdcef8ecc256cd86bc7744d392cda875341cb3 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Mon, 13 Jul 2020 16:22:59 -0600 Subject: [PATCH] mgr/cephadm: clean-up service module type checking - convert to py3 style type checks - other misc type checking fixups Signed-off-by: Michael Fritch --- .../mgr/cephadm/services/cephadmservice.py | 7 +++--- src/pybind/mgr/cephadm/services/nfs.py | 24 +++++++------------ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index 64e67740b8f96..0738f352c7601 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -109,7 +109,7 @@ class CephadmService(metaclass=ABCMeta): def get_active_daemon(self, daemon_descrs: List[DaemonDescription]) -> DaemonDescription: raise NotImplementedError() - def _inventory_get_addr(self, hostname: str): + def _inventory_get_addr(self, hostname: str) -> str: """Get a host's address with its hostname.""" return self.mgr.inventory.get_addr(hostname) @@ -248,7 +248,7 @@ class MonService(CephadmService): 'who': 'mon', 'key': 'public_network', }) - network = network.strip() # type: ignore + network = network.strip() if network else network if not network: raise OrchestratorError('Must set public_network config option or specify a CIDR network, ceph addrvec, or plain IP') if '/' not in network: @@ -260,8 +260,7 @@ class MonService(CephadmService): return self.mgr._create_daemon(daemon_spec) - def _check_safe_to_destroy(self, mon_id): - # type: (str) -> None + def _check_safe_to_destroy(self, mon_id: str) -> None: ret, out, err = self.mgr.check_mon_command({ 'prefix': 'quorum_status', }) diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py index a7b3060c5fb74..c47c4705d0aaa 100644 --- a/src/pybind/mgr/cephadm/services/nfs.py +++ b/src/pybind/mgr/cephadm/services/nfs.py @@ -118,20 +118,16 @@ class NFSGanesha(object): self.daemon_id = daemon_id self.spec = spec - def get_daemon_name(self): - # type: () -> str + def get_daemon_name(self) -> str: return '%s.%s' % (self.spec.service_type, self.daemon_id) - def get_rados_user(self): - # type: () -> str + def get_rados_user(self) -> str: return '%s.%s' % (self.spec.service_type, self.daemon_id) - def get_keyring_entity(self): - # type: () -> str + def get_keyring_entity(self) -> str: return utils.name_to_config_section(self.get_rados_user()) - def get_or_create_keyring(self, entity=None): - # type: (Optional[str]) -> str + def get_or_create_keyring(self, entity: Optional[str] = None) -> str: if not entity: entity = self.get_keyring_entity() @@ -147,8 +143,7 @@ class NFSGanesha(object): % (entity, ret, err)) return keyring - def update_keyring_caps(self, entity=None): - # type: (Optional[str]) -> None + def update_keyring_caps(self, entity: Optional[str] = None) -> None: if not entity: entity = self.get_keyring_entity() @@ -169,8 +164,7 @@ class NFSGanesha(object): 'Unable to update keyring caps %s: %s %s' \ % (entity, ret, err)) - def create_rados_config_obj(self, clobber=False): - # type: (Optional[bool]) -> None + def create_rados_config_obj(self, clobber: Optional[bool] = False) -> None: obj = self.spec.rados_config_name() with self.mgr.rados.open_ioctx(self.spec.pool) as ioctx: @@ -191,8 +185,7 @@ class NFSGanesha(object): logger.info('Creating rados config object: %s' % obj) ioctx.write_full(obj, ''.encode('utf-8')) - def get_ganesha_conf(self): - # type: () -> str + def get_ganesha_conf(self) -> str: context = dict(user=self.get_rados_user(), nodeid=self.get_daemon_name(), pool=self.spec.pool, @@ -200,8 +193,7 @@ class NFSGanesha(object): url=self.spec.rados_config_location()) return self.mgr.template.render('services/nfs/ganesha.conf.j2', context) - def get_cephadm_config(self): - # type: () -> Dict + def get_cephadm_config(self) -> Dict[str, Any]: config = {'pool' : self.spec.pool} # type: Dict if self.spec.namespace: config['namespace'] = self.spec.namespace -- 2.39.5