From 6ec6384c077c79b12c539f14576deecd795386c9 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Tue, 26 Sep 2023 13:28:44 -0400 Subject: [PATCH] cephadm: rename fetch_tcp_ports to fetch_endpoints Rename fetch_tcp_ports to fetch_endpoints to more closely match what the function is doing. Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 8 ++++---- src/cephadm/cephadmlib/context_getters.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 4287ab6f547..4e9227bdc63 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -84,8 +84,8 @@ from cephadmlib.context import CephadmContext from cephadmlib.context_getters import ( fetch_configs, fetch_custom_config_files, + fetch_endpoints, fetch_meta, - fetch_tcp_ports, get_config_and_keyring, get_parm, read_configuration_source, @@ -315,7 +315,7 @@ class SNMPGateway: @property def port(self) -> int: - endpoints = fetch_tcp_ports(self.ctx) + endpoints = fetch_endpoints(self.ctx) if not endpoints: return self.DEFAULT_PORT return endpoints[0].port @@ -5310,7 +5310,7 @@ def _common_deploy(ctx: CephadmContext) -> None: migrate_sysctl_dir(ctx, ctx.fsid) # Get and check ports explicitly required to be opened - endpoints = fetch_tcp_ports(ctx) + endpoints = fetch_endpoints(ctx) _dispatch_deploy(ctx, ident, endpoints, deployment_type) @@ -6593,7 +6593,7 @@ def command_rm_daemon(ctx): else: call_throws(ctx, ['rm', '-rf', data_dir]) - endpoints = fetch_tcp_ports(ctx) + endpoints = fetch_endpoints(ctx) ports: List[int] = [e.port for e in endpoints] if ports: try: diff --git a/src/cephadm/cephadmlib/context_getters.py b/src/cephadm/cephadmlib/context_getters.py index e40319d4706..8af6cbdd01e 100644 --- a/src/cephadm/cephadmlib/context_getters.py +++ b/src/cephadm/cephadmlib/context_getters.py @@ -111,7 +111,7 @@ def fetch_custom_config_files(ctx: CephadmContext) -> List[Dict[str, Any]]: return [] -def fetch_tcp_ports(ctx: CephadmContext) -> List[EndPoint]: +def fetch_endpoints(ctx: CephadmContext) -> List[EndPoint]: """Return a list of Endpoints, which have a port and ip attribute """ ports = getattr(ctx, 'tcp_ports', None) -- 2.39.5