multiSSH3 6.24__tar.gz → 6.25__tar.gz

{multissh3-6.24 → multissh3-6.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 6.24
+Version: 6.25
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-6.24 → multissh3-6.25}/multiSSH3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 6.24
+Version: 6.25
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-6.24 → multissh3-6.25}/multiSSH3.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ tests/test_expand_hostnames.py
 tests/test_harness_smoke.py
 tests/test_helpers_extra.py
 tests/test_host.py
+tests/test_ipmi_lockout_wait.py
 tests/test_main_lifecycle.py
 tests/test_ordered_multiset.py
 tests/test_output_merge.py

{multissh3-6.24 → multissh3-6.25}/multiSSH3.py

@@ -36,7 +36,7 @@ from itertools import count, product
 from pprint import pformat
 
 
-version = '6.24'
+version = '6.25'
 VERSION = version
 __version__ = version
 COMMIT_DATE = '2026-08-11'
@@ -1861,6 +1861,56 @@ def __handle_writing_stream(stream,stop_event,host):
 def _emfile_backoff_seconds(attempt):
 	return min(0.1 * (2 ** attempt), 1.0)
 
+def _ipmi_failure_should_wait(host):
+	'''Return True when the next IPMI password should wait out retry_lockout_time.
+
+	The wait protects a controller that actually rejected a login. Timeouts, routing
+	failures, and a socket that never opened did not reach a BMC, so they skip it.
+	An unrecognized BMC error still waits.
+	'''
+	chunks = []
+	for attr in ('stdout', 'stderr', 'output'):
+		value = getattr(host, attr, None) or []
+		chunks.extend(str(line) for line in value)
+	text = '\n'.join(chunks).lower()
+	auth_markers = (
+		'insufficient resources',
+		'rakp',
+		'unauthorized',
+		'authentication failed',
+		'invalid password',
+		'invalid user',
+		'bad password',
+		'account locked',
+		'user locked',
+		'session limit',
+		'privilege level',
+	)
+	if any(marker in text for marker in auth_markers):
+		return True
+	no_contact_markers = (
+		'could not open socket',
+		'no route to host',
+		'network is unreachable',
+		'connection timed out',
+		'connection refused',
+		'host is down',
+		'destination host unreachable',
+		'name or service not known',
+		'could not resolve',
+		'permission denied',
+		'unable to establish lan session',
+		'unable to establish ipmi v1.5',
+		'timeout!',
+	)
+	if any(marker in text for marker in no_contact_markers):
+		return False
+	if getattr(host, 'returncode', None) == 124:
+		return False
+	if 'unable to establish ipmi v2' in text or 'rmcp+' in text:
+		return True
+	return True
+
 def run_command(host, sem, timeout=60,passwds=None, retry_limit = 7 + len(DEFAULT_IPMI_DEFINITIONS),ipmi_definitions_list = ...):
 	'''
 	Run the command on the host. Will format the commands accordingly. Main execution function.
@@ -2199,6 +2249,7 @@ def run_command(host, sem, timeout=60,passwds=None, retry_limit = 7 + len(DEFAUL
 		retry_limit -= 1
 	# If using ipmi, we will try again using next ipmi definition if ipmi connection is not successful
 	if host.ipmi and host.returncode != 0:
+		should_wait = _ipmi_failure_should_wait(host)
 		host.returncode = None
 		host.output.append('IPMI connection failed! Trying next ipmi definition...')
 		if __DEBUG_MODE:
@@ -2209,11 +2260,13 @@ def run_command(host, sem, timeout=60,passwds=None, retry_limit = 7 + len(DEFAUL
 		if ipmi_definition.get('retry_lockout_time'):
 			try:
 				sleep_seconds = int(ipmi_definition.get('retry_lockout_time'))
-				if sleep_seconds >= 0:
+				if sleep_seconds >= 0 and should_wait:
 					host.output.append(f'Sleeping for {sleep_seconds} seconds...')
 					if __DEBUG_MODE:
 						host.stderr.append(f'Sleeping for {sleep_seconds} seconds...')
 					time.sleep(sleep_seconds)
+				elif sleep_seconds >= 0:
+					host.output.append('Skipping IPMI lockout wait; the controller was not reached.')
 			except Exception as e:
 				host.output.append(f'Error: Failed to sleep for {ipmi_definition.get("retry_lockout_time")} seconds! {e}')
 				if __DEBUG_MODE:

multissh3-6.25/tests/test_ipmi_lockout_wait.py

@@ -0,0 +1,32 @@
+import multiSSH3
+
+
+class _Host:
+	def __init__(self, stderr, returncode=1):
+		self.stdout = []
+		self.stderr = stderr
+		self.output = []
+		self.returncode = returncode
+
+
+def test_ipmi_lockout_wait_skips_when_bmc_was_not_reached():
+	cases = [
+		["Could not open socket!", "Error: Unable to establish IPMI v2 / RMCP+ session"],
+		["Error: Unable to establish LAN session", "Error: Unable to establish IPMI v1.5 / RMCP session"],
+		["Timeout!"],
+		["ssh: connect to host 10.251.5.57 port 22: Connection timed out"],
+		["Permission denied, please try again."],
+	]
+	for stderr in cases:
+		assert multiSSH3._ipmi_failure_should_wait(_Host(stderr, 124 if stderr == ["Timeout!"] else 1)) is False
+
+
+def test_ipmi_lockout_wait_runs_after_bmc_auth_failure():
+	cases = [
+		["RAKP 2 HMAC is invalid", "Error: Unable to establish IPMI v2 / RMCP+ session"],
+		["RAKP 2 message indicates an error : insufficient resources for session"],
+		["Error: Unable to establish IPMI v2 / RMCP+ session"],
+		["Set Session Privilege Level to ADMINISTRATOR failed"],
+	]
+	for stderr in cases:
+		assert multiSSH3._ipmi_failure_should_wait(_Host(stderr)) is True