Skip to content

Commit 0509631

Browse files
committed
Dev: utils: Rename utils.node_reachable_check to utils.ssh_reachable_check
1 parent f3bbf1e commit 0509631

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

crmsh/bootstrap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def _validate_nodes_option(self):
275275
utils.fatal(f"Overriding current user '{self.current_user}' by '{user}'. Ouch, don't do it.")
276276
self.user_at_node_list = [value for (user, node), value in zip(li, self.user_at_node_list) if node != me]
277277
for user, node in (utils.parse_user_at_host(x) for x in self.user_at_node_list):
278-
utils.node_reachable_check(node)
278+
utils.ssh_reachable_check(node)
279279

280280
def _validate_cluster_node(self):
281281
"""
@@ -2449,7 +2449,7 @@ def bootstrap_join(context):
24492449
_context.initialize_user()
24502450

24512451
remote_user, cluster_node = _parse_user_at_host(_context.cluster_node, _context.current_user)
2452-
utils.node_reachable_check(cluster_node)
2452+
utils.ssh_reachable_check(cluster_node)
24532453
join_ssh(cluster_node, remote_user)
24542454
remote_user = utils.user_of(cluster_node)
24552455

crmsh/qdevice.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def check_qnetd_addr(qnetd_addr):
208208
except socket.error:
209209
raise ValueError("host \"{}\" is unreachable".format(qnetd_addr))
210210

211-
utils.node_reachable_check(qnetd_addr)
211+
utils.ssh_reachable_check(qnetd_addr)
212212

213213
if utils.InterfacesInfo.ip_in_local(qnetd_ip):
214214
raise ValueError("host for qnetd must be a remote one")

crmsh/utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,7 +2405,7 @@ def package_is_installed(pkg, remote_addr=None):
24052405
return rc == 0
24062406

24072407

2408-
def node_reachable_check(node):
2408+
def ssh_reachable_check(node):
24092409
"""
24102410
Check if node is reachable by checking SSH port is open
24112411
"""
@@ -2421,7 +2421,7 @@ def get_reachable_node_list(node_list:list[str]) -> list[str]:
24212421
reachable_node_list = []
24222422
for node in node_list:
24232423
try:
2424-
if node_reachable_check(node):
2424+
if ssh_reachable_check(node):
24252425
reachable_node_list.append(node)
24262426
except ValueError as e:
24272427
logger.warning(str(e))
@@ -2465,7 +2465,7 @@ def check_all_nodes_reachable(action_to_do: str, peer_node: str = None):
24652465
dead_nodes = []
24662466
for node in offline_nodes:
24672467
try:
2468-
node_reachable_check(node)
2468+
ssh_reachable_check(node)
24692469
except ValueError:
24702470
dead_nodes.append(node)
24712471
if dead_nodes:
@@ -2479,7 +2479,7 @@ def check_all_nodes_reachable(action_to_do: str, peer_node: str = None):
24792479
unreachable_nodes = []
24802480
for node in online_nodes:
24812481
try:
2482-
node_reachable_check(node)
2482+
ssh_reachable_check(node)
24832483
except ValueError:
24842484
unreachable_nodes.append(node)
24852485
if unreachable_nodes:

0 commit comments

Comments
 (0)