From 70bd5b3b1a254508f00f5ebf1959afd322bcc454 Mon Sep 17 00:00:00 2001 From: speriaswamy-amd Date: Tue, 1 Sep 2026 12:50:05 -0400 Subject: [PATCH 1/2] fix(preflight): make l2ping ssh_timeout and loss threshold configurable Half-cabled afmctl sweeps exceed the hardcoded 180s cap and prune healthy nodes; expose ssh_timeout (default 600s) and loss_threshold_pct so operators can override. Co-authored-by: Cursor --- .../preflight/README_preflight_config.md | 11 +++- .../preflight/preflight_config.json | 8 ++- cvs/lib/preflight/ifoe_l2_connectivity.py | 2 +- cvs/lib/preflight/report.py | 3 + .../unittests/test_ifoe_l2_connectivity.py | 56 ++++++++++++++++++- cvs/parsers/schemas.py | 11 ++++ cvs/tests/preflight/preflight_checks.py | 25 +++++++-- 7 files changed, 105 insertions(+), 11 deletions(-) diff --git a/cvs/input/config_file/preflight/README_preflight_config.md b/cvs/input/config_file/preflight/README_preflight_config.md index 7e2ce7ee5..3bb7a2cec 100644 --- a/cvs/input/config_file/preflight/README_preflight_config.md +++ b/cvs/input/config_file/preflight/README_preflight_config.md @@ -291,8 +291,8 @@ They now follow this fixed policy: | `dst_accelerators` | Build strict destination coverage from reconciled vPOD membership | | `ports` | Test admitted, station-mask-enabled ports that are operationally up | | `traffic_types` | Enforce IFoE request, IFoE response, and non-IFoE traffic | -| `loss_threshold_pct` | Fail on any reported loss or incomplete coverage | -| `per_ping_timeout` / `ssh_timeout` | Derive conservative timeouts from the requested workload | +| `loss_threshold_pct` | Default 0.0 (any reported loss fails the node); overridable via `l2ping.loss_threshold_pct` | +| `per_ping_timeout` / `ssh_timeout` | Default 600s SSH timeout per afmctl invocation; overridable via `l2ping.ssh_timeout` | - **`fabric_checks`** (default: `false`) - Enables MI4XX-only AIFM/AFM/vPOD, station-mask, and IFoE port admission checks @@ -308,6 +308,13 @@ port and validates per-port and aggregate summary accounting. - Enables the mandatory L2 connectivity gate before TransferBench and RDMA - **`pings_per_port`** (default: `3`) - Number of ping samples sent per selected IFoE port pair +- **`ssh_timeout`** (default: `600`) + - SSH timeout in seconds for each `afmctl` invocation. Raise this when large + port counts or half-cabled BDFs make a sweep take longer than the previous + 180s cap (measured healthy sweep ~117s, half-cabled ~260s). +- **`loss_threshold_pct`** (default: `0.0`) + - Maximum tolerated packet loss percentage per traffic type. Keep `0.0` for a + strict gate; raise it only when known-dead ports should not fail the node. ##### TransferBench (`connectivity_check.ifoe.transferbench`) diff --git a/cvs/input/config_file/preflight/preflight_config.json b/cvs/input/config_file/preflight/preflight_config.json index 6cbda7191..02ec02b5f 100644 --- a/cvs/input/config_file/preflight/preflight_config.json +++ b/cvs/input/config_file/preflight/preflight_config.json @@ -86,7 +86,13 @@ "_comment_enabled": "Enable IFoE L2 connectivity validation.", "pings_per_port": 3, - "_comment_pings_per_port": "Ping samples sent per selected IFoE port pair." + "_comment_pings_per_port": "Ping samples sent per selected IFoE port pair.", + + "ssh_timeout": 600, + "_comment_ssh_timeout": "SSH timeout in seconds for each afmctl invocation. Half-cabled BDFs can exceed the old 180s cap; 600s covers measured ~260s sweeps and afmctl's 5-minute default -t.", + + "loss_threshold_pct": 0.0, + "_comment_loss_threshold_pct": "Maximum tolerated packet loss percentage per traffic type. 0.0 fails the node on any down port. Raise only when known-dead ports should not fail an otherwise healthy fabric." }, "transferbench": { diff --git a/cvs/lib/preflight/ifoe_l2_connectivity.py b/cvs/lib/preflight/ifoe_l2_connectivity.py index 50bd2a09b..687c84649 100644 --- a/cvs/lib/preflight/ifoe_l2_connectivity.py +++ b/cvs/lib/preflight/ifoe_l2_connectivity.py @@ -882,7 +882,7 @@ class IfoeL2ConnectivityCheck(PreflightCheck): DEFAULT_AFMCTL_PATH = "afmctl" DEFAULT_PINGS_PER_PORT = 1 - DEFAULT_SSH_TIMEOUT_SEC = 180 + DEFAULT_SSH_TIMEOUT_SEC = 600 DEFAULT_LOSS_THRESHOLD_PCT = 0.0 DEFAULT_TRAFFIC_TYPES: Tuple[str, ...] = TRAFFIC_TYPES diff --git a/cvs/lib/preflight/report.py b/cvs/lib/preflight/report.py index df8be59df..61eb53895 100644 --- a/cvs/lib/preflight/report.py +++ b/cvs/lib/preflight/report.py @@ -1532,6 +1532,8 @@ def _generate_ifoe_l2_html(self, ifoe_results): failed_invocations = int(ifoe_results.get('failed_invocations', 0)) pings_per_port = int(ifoe_results.get('pings_per_port', 3)) loss_threshold = ifoe_results.get('loss_threshold_pct', 0.0) + ssh_timeout = ifoe_results.get('ssh_timeout') + ssh_timeout_txt = f"{ssh_timeout}s" if ssh_timeout is not None else "600s (default)" traffic_types = ifoe_results.get('traffic_types') or [] mesh_mode = ifoe_results.get('mesh_mode', 'full_mesh') ports = ifoe_results.get('ports', 'up') @@ -1551,6 +1553,7 @@ def _generate_ifoe_l2_html(self, ifoe_results): result mode: {html.escape(str(failure_mode))}; Traffic types enforced: {html.escape(", ".join(str(t) for t in traffic_types))}; loss threshold: {html.escape(str(loss_threshold))}%; + ssh timeout: {html.escape(str(ssh_timeout_txt))}; invocations: {total_invocations - failed_invocations}/{total_invocations} succeeded.

""" diff --git a/cvs/lib/preflight/unittests/test_ifoe_l2_connectivity.py b/cvs/lib/preflight/unittests/test_ifoe_l2_connectivity.py index e419e8b37..40c849fc9 100644 --- a/cvs/lib/preflight/unittests/test_ifoe_l2_connectivity.py +++ b/cvs/lib/preflight/unittests/test_ifoe_l2_connectivity.py @@ -913,7 +913,7 @@ def test_strict_full_mesh_requires_vpod_membership(self): class TestL2PingConfigContract(unittest.TestCase): - def test_schema_accepts_only_the_two_customer_facing_options(self): + def test_schema_accepts_timeout_and_loss_overrides(self): config = PreflightConfigFile.model_validate( { 'connectivity_check': { @@ -921,6 +921,8 @@ def test_schema_accepts_only_the_two_customer_facing_options(self): 'l2ping': { 'enabled': True, 'pings_per_port': 5, + 'loss_threshold_pct': 3.0, + 'ssh_timeout': 600, } } } @@ -929,6 +931,8 @@ def test_schema_accepts_only_the_two_customer_facing_options(self): self.assertTrue(config.connectivity_check.ifoe.l2ping.enabled) self.assertEqual(config.connectivity_check.ifoe.l2ping.pings_per_port, 5) + self.assertEqual(config.connectivity_check.ifoe.l2ping.loss_threshold_pct, 3.0) + self.assertEqual(config.connectivity_check.ifoe.l2ping.ssh_timeout, 600) with self.assertRaises(ValidationError): PreflightConfigFile.model_validate( @@ -938,7 +942,7 @@ def test_schema_accepts_only_the_two_customer_facing_options(self): 'l2ping': { 'enabled': True, 'pings_per_port': 3, - 'loss_threshold_pct': 1.0, + 'mesh_mode': 'full_mesh', } } } @@ -998,6 +1002,7 @@ def test_preflight_entrypoint_uses_fixed_strict_policy(self): self.assertEqual(kwargs['ports'], 'up') self.assertEqual(kwargs['traffic_types'], ['ifoe_req', 'ifoe_resp', 'non_ifoe']) self.assertEqual(kwargs['loss_threshold_pct'], 0.0) + self.assertEqual(kwargs['ssh_timeout'], 600) self.assertTrue(kwargs['require_complete_coverage']) self.assertTrue(kwargs['strict_discovery']) self.assertFalse(kwargs['allow_text_fallback']) @@ -1010,6 +1015,53 @@ def test_preflight_entrypoint_uses_fixed_strict_policy(self): preflight_checks.preflight_results.clear() preflight_checks.preflight_results.update(previous_results) + def test_preflight_entrypoint_honors_l2ping_timeout_and_loss_overrides(self): + from cvs.tests.preflight import preflight_checks + + phdl = MagicMock() + phdl.reachable_hosts = ['nodeA'] + config = { + 'connectivity_check': { + 'ifoe': { + 'l2ping': { + 'enabled': True, + 'pings_per_port': 3, + 'ssh_timeout': 900, + 'loss_threshold_pct': 3.0, + } + } + } + } + cluster = {'node_dict': {'nodeA': {}}} + checker_results = { + 'nodeA': { + 'status': 'PASS', + 'errors': [], + 'accelerators': {}, + 'coverage': {'complete': True}, + } + } + + previous_results = dict(preflight_checks.preflight_results) + preflight_checks.preflight_results.clear() + try: + with ( + patch.object(preflight_checks, 'IfoeL2ConnectivityCheck') as checker_cls, + patch.object(preflight_checks, 'preflight_update_test_result'), + ): + checker_cls.return_value.run.return_value = checker_results + preflight_checks.test_ifoe_l2_connectivity(phdl, config, cluster) + + kwargs = checker_cls.call_args.kwargs + self.assertEqual(kwargs['ssh_timeout'], 900) + self.assertEqual(kwargs['loss_threshold_pct'], 3.0) + result = preflight_checks.preflight_results['ifoe_l2_connectivity'] + self.assertEqual(result['ssh_timeout'], 900) + self.assertEqual(result['loss_threshold_pct'], 3.0) + finally: + preflight_checks.preflight_results.clear() + preflight_checks.preflight_results.update(previous_results) + def test_disabled_l2ping_skips_without_constructing_checker(self): from cvs.tests.preflight import preflight_checks diff --git a/cvs/parsers/schemas.py b/cvs/parsers/schemas.py index ec9ece90e..1ae33de32 100644 --- a/cvs/parsers/schemas.py +++ b/cvs/parsers/schemas.py @@ -1373,6 +1373,17 @@ class PreflightL2PingConfig(BaseModel): enabled: bool = Field(default=False, description="Enable the mandatory IFoE L2 connectivity gate") pings_per_port: int = Field(default=3, ge=1, description="Ping samples per selected IFoE port pair") + loss_threshold_pct: float = Field( + default=0.0, + ge=0.0, + le=100.0, + description="Maximum tolerated packet loss percentage per traffic type", + ) + ssh_timeout: int = Field( + default=600, + ge=30, + description="SSH timeout in seconds for each afmctl invocation", + ) class PreflightTransferBenchConfig(BaseModel): diff --git a/cvs/tests/preflight/preflight_checks.py b/cvs/tests/preflight/preflight_checks.py index 0e3f9e542..5b8a41393 100644 --- a/cvs/tests/preflight/preflight_checks.py +++ b/cvs/tests/preflight/preflight_checks.py @@ -815,7 +815,11 @@ def _l2ping_config(config_dict): config = _ifoe_config(config_dict).get('l2ping', {}) if not isinstance(config, dict): raise ValueError("preflight.connectivity_check.ifoe.l2ping must be an object") - unknown = sorted(key for key in set(config) - {'enabled', 'pings_per_port'} if not key.startswith('_')) + unknown = sorted( + key + for key in set(config) - {'enabled', 'pings_per_port', 'loss_threshold_pct', 'ssh_timeout'} + if not key.startswith('_') + ) if unknown: raise ValueError("Unsupported preflight.connectivity_check.ifoe.l2ping option(s): " + ', '.join(unknown)) return config @@ -889,9 +893,19 @@ def _run_ifoe_l2_connectivity(phdl, config_dict, cluster_dict): if pings_per_port < 1: raise ValueError("preflight.connectivity_check.ifoe.l2ping.pings_per_port must be at least 1") + loss_threshold_pct = float(l2ping_config.get('loss_threshold_pct', 0.0)) + if loss_threshold_pct < 0.0 or loss_threshold_pct > 100.0: + raise ValueError("preflight.connectivity_check.ifoe.l2ping.loss_threshold_pct must be between 0 and 100") + + ssh_timeout = int(l2ping_config.get('ssh_timeout', 600)) + if ssh_timeout < 30: + raise ValueError("preflight.connectivity_check.ifoe.l2ping.ssh_timeout must be at least 30 seconds") + log.info( - "Running strict IFoE L2 full-mesh connectivity (pings_per_port=%d) on %d host(s)", + "Running strict IFoE L2 full-mesh connectivity (pings_per_port=%d, ssh_timeout=%ds, loss_threshold_pct=%.2f) on %d host(s)", pings_per_port, + ssh_timeout, + loss_threshold_pct, len(phdl.reachable_hosts), ) @@ -906,8 +920,8 @@ def _run_ifoe_l2_connectivity(phdl, config_dict, cluster_dict): pings_per_port=pings_per_port, per_ping_timeout=None, traffic_types=['ifoe_req', 'ifoe_resp', 'non_ifoe'], - loss_threshold_pct=0.0, - ssh_timeout=180, + loss_threshold_pct=loss_threshold_pct, + ssh_timeout=ssh_timeout, use_sudo=True, json_args=['--json'], allow_text_fallback=False, @@ -947,7 +961,8 @@ def _run_ifoe_l2_connectivity(phdl, config_dict, cluster_dict): 'total_invocations': total_invocations, 'failed_invocations': failed_invocations, 'pings_per_port': pings_per_port, - 'loss_threshold_pct': 0.0, + 'loss_threshold_pct': loss_threshold_pct, + 'ssh_timeout': ssh_timeout, 'traffic_types': ['ifoe_req', 'ifoe_resp', 'non_ifoe'], 'mesh_mode': 'full_mesh', 'ports': 'up', From 18f1bf47a6b2de58d7f7c9c34c921a684a5fdf0f Mon Sep 17 00:00:00 2001 From: speriaswamy-amd Date: Wed, 2 Sep 2026 14:41:39 -0400 Subject: [PATCH 2/2] fix(preflight): rename l2ping ssh_timeout to ping_timeout Customer JSON should name the PSSH read_timeout, not DEFAULT_SSH_TIMEOUT_SEC. The checker still takes ssh_timeout internally. Co-authored-by: Cursor --- .../preflight/README_preflight_config.md | 6 ++--- .../preflight/preflight_config.json | 6 ++--- cvs/lib/preflight/report.py | 6 ++--- .../unittests/test_ifoe_l2_connectivity.py | 23 +++++++++++++++---- cvs/parsers/schemas.py | 4 ++-- cvs/tests/preflight/preflight_checks.py | 16 ++++++------- 6 files changed, 38 insertions(+), 23 deletions(-) diff --git a/cvs/input/config_file/preflight/README_preflight_config.md b/cvs/input/config_file/preflight/README_preflight_config.md index 3bb7a2cec..7ab97a20e 100644 --- a/cvs/input/config_file/preflight/README_preflight_config.md +++ b/cvs/input/config_file/preflight/README_preflight_config.md @@ -292,7 +292,7 @@ They now follow this fixed policy: | `ports` | Test admitted, station-mask-enabled ports that are operationally up | | `traffic_types` | Enforce IFoE request, IFoE response, and non-IFoE traffic | | `loss_threshold_pct` | Default 0.0 (any reported loss fails the node); overridable via `l2ping.loss_threshold_pct` | -| `per_ping_timeout` / `ssh_timeout` | Default 600s SSH timeout per afmctl invocation; overridable via `l2ping.ssh_timeout` | +| `per_ping_timeout` / `ping_timeout` | Default 600s PSSH read timeout per afmctl invocation; overridable via `l2ping.ping_timeout` | - **`fabric_checks`** (default: `false`) - Enables MI4XX-only AIFM/AFM/vPOD, station-mask, and IFoE port admission checks @@ -308,8 +308,8 @@ port and validates per-port and aggregate summary accounting. - Enables the mandatory L2 connectivity gate before TransferBench and RDMA - **`pings_per_port`** (default: `3`) - Number of ping samples sent per selected IFoE port pair -- **`ssh_timeout`** (default: `600`) - - SSH timeout in seconds for each `afmctl` invocation. Raise this when large +- **`ping_timeout`** (default: `600`) + - PSSH `read_timeout` in seconds for each `afmctl` ping invocation. Raise this when large port counts or half-cabled BDFs make a sweep take longer than the previous 180s cap (measured healthy sweep ~117s, half-cabled ~260s). - **`loss_threshold_pct`** (default: `0.0`) diff --git a/cvs/input/config_file/preflight/preflight_config.json b/cvs/input/config_file/preflight/preflight_config.json index 02ec02b5f..dbc54bea9 100644 --- a/cvs/input/config_file/preflight/preflight_config.json +++ b/cvs/input/config_file/preflight/preflight_config.json @@ -72,7 +72,7 @@ "_comment_per_ping_timeout": "Optional value for afmctl's -t flag (per-ping timeout). Leave null to use afmctl's default.", "_comment_traffic_types": "Traffic categories to enforce when evaluating PASS/FAIL. Maps to afmctl's --traffic-type (request, response, non-ifoe). When all three are selected (default) --traffic-type is omitted so afmctl exercises every category.", "_comment_loss_threshold_pct": "Maximum tolerated packet loss percentage per traffic type. Defaults to 0.0 (any failure marks the node as FAIL).", - "_comment_ssh_timeout": "Overall SSH timeout (seconds) for each afmctl invocation. Increase for large port counts or high pings_per_port values.", + "_comment_ping_timeout": "PSSH read timeout (seconds) for each afmctl ping invocation. Increase for large port counts or high pings_per_port values.", "fabric_checks": false, "_comment_fabric_checks": "Enable MI4XX-only AIFM/AFM/vPOD, station-mask, and IFoE port admission checks.", @@ -88,8 +88,8 @@ "pings_per_port": 3, "_comment_pings_per_port": "Ping samples sent per selected IFoE port pair.", - "ssh_timeout": 600, - "_comment_ssh_timeout": "SSH timeout in seconds for each afmctl invocation. Half-cabled BDFs can exceed the old 180s cap; 600s covers measured ~260s sweeps and afmctl's 5-minute default -t.", + "ping_timeout": 600, + "_comment_ping_timeout": "PSSH read timeout in seconds for each afmctl ping invocation. Half-cabled BDFs can exceed the old 180s cap; 600s covers measured ~260s sweeps and afmctl's 5-minute default -t.", "loss_threshold_pct": 0.0, "_comment_loss_threshold_pct": "Maximum tolerated packet loss percentage per traffic type. 0.0 fails the node on any down port. Raise only when known-dead ports should not fail an otherwise healthy fabric." diff --git a/cvs/lib/preflight/report.py b/cvs/lib/preflight/report.py index 61eb53895..8793c7fba 100644 --- a/cvs/lib/preflight/report.py +++ b/cvs/lib/preflight/report.py @@ -1532,8 +1532,8 @@ def _generate_ifoe_l2_html(self, ifoe_results): failed_invocations = int(ifoe_results.get('failed_invocations', 0)) pings_per_port = int(ifoe_results.get('pings_per_port', 3)) loss_threshold = ifoe_results.get('loss_threshold_pct', 0.0) - ssh_timeout = ifoe_results.get('ssh_timeout') - ssh_timeout_txt = f"{ssh_timeout}s" if ssh_timeout is not None else "600s (default)" + ping_timeout = ifoe_results.get('ping_timeout', ifoe_results.get('ssh_timeout')) + ping_timeout_txt = f"{ping_timeout}s" if ping_timeout is not None else "600s (default)" traffic_types = ifoe_results.get('traffic_types') or [] mesh_mode = ifoe_results.get('mesh_mode', 'full_mesh') ports = ifoe_results.get('ports', 'up') @@ -1553,7 +1553,7 @@ def _generate_ifoe_l2_html(self, ifoe_results): result mode: {html.escape(str(failure_mode))}; Traffic types enforced: {html.escape(", ".join(str(t) for t in traffic_types))}; loss threshold: {html.escape(str(loss_threshold))}%; - ssh timeout: {html.escape(str(ssh_timeout_txt))}; + ping timeout: {html.escape(str(ping_timeout_txt))}; invocations: {total_invocations - failed_invocations}/{total_invocations} succeeded.

""" diff --git a/cvs/lib/preflight/unittests/test_ifoe_l2_connectivity.py b/cvs/lib/preflight/unittests/test_ifoe_l2_connectivity.py index 40c849fc9..1948f7783 100644 --- a/cvs/lib/preflight/unittests/test_ifoe_l2_connectivity.py +++ b/cvs/lib/preflight/unittests/test_ifoe_l2_connectivity.py @@ -922,7 +922,7 @@ def test_schema_accepts_timeout_and_loss_overrides(self): 'enabled': True, 'pings_per_port': 5, 'loss_threshold_pct': 3.0, - 'ssh_timeout': 600, + 'ping_timeout': 600, } } } @@ -932,7 +932,22 @@ def test_schema_accepts_timeout_and_loss_overrides(self): self.assertTrue(config.connectivity_check.ifoe.l2ping.enabled) self.assertEqual(config.connectivity_check.ifoe.l2ping.pings_per_port, 5) self.assertEqual(config.connectivity_check.ifoe.l2ping.loss_threshold_pct, 3.0) - self.assertEqual(config.connectivity_check.ifoe.l2ping.ssh_timeout, 600) + self.assertEqual(config.connectivity_check.ifoe.l2ping.ping_timeout, 600) + + with self.assertRaises(ValidationError): + PreflightConfigFile.model_validate( + { + 'connectivity_check': { + 'ifoe': { + 'l2ping': { + 'enabled': True, + 'pings_per_port': 3, + 'ssh_timeout': 600, + } + } + } + } + ) with self.assertRaises(ValidationError): PreflightConfigFile.model_validate( @@ -1026,7 +1041,7 @@ def test_preflight_entrypoint_honors_l2ping_timeout_and_loss_overrides(self): 'l2ping': { 'enabled': True, 'pings_per_port': 3, - 'ssh_timeout': 900, + 'ping_timeout': 900, 'loss_threshold_pct': 3.0, } } @@ -1056,7 +1071,7 @@ def test_preflight_entrypoint_honors_l2ping_timeout_and_loss_overrides(self): self.assertEqual(kwargs['ssh_timeout'], 900) self.assertEqual(kwargs['loss_threshold_pct'], 3.0) result = preflight_checks.preflight_results['ifoe_l2_connectivity'] - self.assertEqual(result['ssh_timeout'], 900) + self.assertEqual(result['ping_timeout'], 900) self.assertEqual(result['loss_threshold_pct'], 3.0) finally: preflight_checks.preflight_results.clear() diff --git a/cvs/parsers/schemas.py b/cvs/parsers/schemas.py index 1ae33de32..547d4890f 100644 --- a/cvs/parsers/schemas.py +++ b/cvs/parsers/schemas.py @@ -1379,10 +1379,10 @@ class PreflightL2PingConfig(BaseModel): le=100.0, description="Maximum tolerated packet loss percentage per traffic type", ) - ssh_timeout: int = Field( + ping_timeout: int = Field( default=600, ge=30, - description="SSH timeout in seconds for each afmctl invocation", + description="PSSH read timeout in seconds for each afmctl ping invocation", ) diff --git a/cvs/tests/preflight/preflight_checks.py b/cvs/tests/preflight/preflight_checks.py index 5b8a41393..d020c593d 100644 --- a/cvs/tests/preflight/preflight_checks.py +++ b/cvs/tests/preflight/preflight_checks.py @@ -817,7 +817,7 @@ def _l2ping_config(config_dict): raise ValueError("preflight.connectivity_check.ifoe.l2ping must be an object") unknown = sorted( key - for key in set(config) - {'enabled', 'pings_per_port', 'loss_threshold_pct', 'ssh_timeout'} + for key in set(config) - {'enabled', 'pings_per_port', 'loss_threshold_pct', 'ping_timeout'} if not key.startswith('_') ) if unknown: @@ -897,14 +897,14 @@ def _run_ifoe_l2_connectivity(phdl, config_dict, cluster_dict): if loss_threshold_pct < 0.0 or loss_threshold_pct > 100.0: raise ValueError("preflight.connectivity_check.ifoe.l2ping.loss_threshold_pct must be between 0 and 100") - ssh_timeout = int(l2ping_config.get('ssh_timeout', 600)) - if ssh_timeout < 30: - raise ValueError("preflight.connectivity_check.ifoe.l2ping.ssh_timeout must be at least 30 seconds") + ping_timeout = int(l2ping_config.get('ping_timeout', 600)) + if ping_timeout < 30: + raise ValueError("preflight.connectivity_check.ifoe.l2ping.ping_timeout must be at least 30 seconds") log.info( - "Running strict IFoE L2 full-mesh connectivity (pings_per_port=%d, ssh_timeout=%ds, loss_threshold_pct=%.2f) on %d host(s)", + "Running strict IFoE L2 full-mesh connectivity (pings_per_port=%d, ping_timeout=%ds, loss_threshold_pct=%.2f) on %d host(s)", pings_per_port, - ssh_timeout, + ping_timeout, loss_threshold_pct, len(phdl.reachable_hosts), ) @@ -921,7 +921,7 @@ def _run_ifoe_l2_connectivity(phdl, config_dict, cluster_dict): per_ping_timeout=None, traffic_types=['ifoe_req', 'ifoe_resp', 'non_ifoe'], loss_threshold_pct=loss_threshold_pct, - ssh_timeout=ssh_timeout, + ssh_timeout=ping_timeout, use_sudo=True, json_args=['--json'], allow_text_fallback=False, @@ -962,7 +962,7 @@ def _run_ifoe_l2_connectivity(phdl, config_dict, cluster_dict): 'failed_invocations': failed_invocations, 'pings_per_port': pings_per_port, 'loss_threshold_pct': loss_threshold_pct, - 'ssh_timeout': ssh_timeout, + 'ping_timeout': ping_timeout, 'traffic_types': ['ifoe_req', 'ifoe_resp', 'non_ifoe'], 'mesh_mode': 'full_mesh', 'ports': 'up',