diff --git a/CHANGELOG.md b/CHANGELOG.md index d1145c5..6d5b4f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ All notable changes to this driver. The format follows ## [Unreleased] ### Fixed +- `get_snmp_config()` reads the community from the table's `Name` column. It took the + first column, which is `Index` on the switch, and reported the community as `1`. - The SSH key exchange no longer uses `diffie-hellman-group16-sha512`. On an SG2210P with firmware 5.30 its 4096-bit exchange took 9 to 16 seconds, against netmiko's 10-second `conn_timeout`, so every other connection failed and the switch flapped diff --git a/napalm_tplink_jetstream/parsers.py b/napalm_tplink_jetstream/parsers.py new file mode 100644 index 0000000..017a21c --- /dev/null +++ b/napalm_tplink_jetstream/parsers.py @@ -0,0 +1,29 @@ +"""Pure parsers: the switch's CLI output in, plain values out.""" + +from __future__ import annotations + +import re + +_DASHES = re.compile(r"^-{4,}$") + + +def parse_snmp_communities(output: str) -> list[str]: + """The community names in ``show snmp-server community``, in the switch's order. + + The table starts with an ``Index`` column: the name is the column headed + ``Name``, found in the header line above the dashes. Without one, no name. + """ + names: list[str] = [] + header: list[str] = [] + column: int | None = None + for line in output.splitlines(): + words = line.split() + if not words: + continue + if column is None: + if _DASHES.match(words[0]): + column = next((i for i, w in enumerate(header) if "name" in w.lower()), -1) + header = words + elif 0 <= column < len(words): + names.append(words[column]) + return names diff --git a/napalm_tplink_jetstream/tplink_jetstream.py b/napalm_tplink_jetstream/tplink_jetstream.py index b1a6bab..0c512d8 100644 --- a/napalm_tplink_jetstream/tplink_jetstream.py +++ b/napalm_tplink_jetstream/tplink_jetstream.py @@ -39,6 +39,7 @@ from netmiko import ConnectHandler from netmiko.exceptions import NetmikoAuthenticationException, NetmikoTimeoutException from napalm_tplink_jetstream._ssh import netmiko_connect_args +from napalm_tplink_jetstream.parsers import parse_snmp_communities logger = logging.getLogger(__name__) @@ -1939,22 +1940,10 @@ class TPLinkJetstreamDriver(ConfigLifecycleMixin, SnmpAgentMixin, SwitchDriver): if not out or "disabled" in out.lower() or "no community entry exists" in out.lower(): return no_agent - community = None - in_table = False - for line in out.splitlines(): - line_s = line.strip() - if re.match(r"^-{4,}", line_s): - in_table = True - continue - if not in_table or not line_s: - continue - parts = line_s.split() - if len(parts) >= 2: - community = parts[0] - break - if community is None: + communities = parse_snmp_communities(out) + if not communities: return no_agent - return SNMPConfigDict(running=True, community=community, port=161, version="2c") + return SNMPConfigDict(running=True, community=communities[0], port=161, version="2c") def get_device_warnings(self) -> list: """Return device warnings. Currently delegates to SNMP detection only.""" diff --git a/tests/fixtures/jetstream-show-snmp-server-community.txt b/tests/fixtures/jetstream-show-snmp-server-community.txt new file mode 100644 index 0000000..ff62915 --- /dev/null +++ b/tests/fixtures/jetstream-show-snmp-server-community.txt @@ -0,0 +1,3 @@ +Index Name Type MIB-View +----- ---- ---- -------- +1 public read-only viewDefault diff --git a/tests/quality_baseline.json b/tests/quality_baseline.json index 7094dfe..db2f48d 100644 --- a/tests/quality_baseline.json +++ b/tests/quality_baseline.json @@ -27,7 +27,7 @@ "napalm_tplink_jetstream.tplink_jetstream" ], "python_file_lines": { - "napalm_tplink_jetstream/tplink_jetstream.py": 2024 + "napalm_tplink_jetstream/tplink_jetstream.py": 2013 }, "untyped_public": [] } diff --git a/tests/unit/test_snmp_config.py b/tests/unit/test_snmp_config.py index 40ad090..5a7644a 100644 --- a/tests/unit/test_snmp_config.py +++ b/tests/unit/test_snmp_config.py @@ -3,14 +3,24 @@ It started from "public" and kept it when no table row parsed, so a switch whose community table could not be read reported a running agent with the community "public". + +The fixture is ``show snmp-server community`` recorded from a JetStream switch: its +table starts with an ``Index`` column, which was read as the community. """ +from pathlib import Path from unittest.mock import MagicMock import pytest from napalm_tplink_jetstream.tplink_jetstream import TPLinkJetstreamDriver +FIXTURES = Path(__file__).parent.parent / "fixtures" + +SHOW_SNMP_COMMUNITY = (FIXTURES / "jetstream-show-snmp-server-community.txt").read_text() +#: The recording without its only row. +NO_COMMUNITY = "".join(SHOW_SNMP_COMMUNITY.splitlines(keepends=True)[:2]) + def _driver(output: str) -> TPLinkJetstreamDriver: driver = TPLinkJetstreamDriver("10.0.0.30", "admin", "pw") @@ -19,18 +29,18 @@ def _driver(output: str) -> TPLinkJetstreamDriver: def test_the_listed_community_is_reported(): - out = "Index Community-Name Access\n----- -------------- ------\nc0mm read-only x\n" + config = _driver(SHOW_SNMP_COMMUNITY).get_snmp_config() - config = _driver(out).get_snmp_config() - - assert config == {"running": True, "community": "c0mm", "port": 161, "version": "2c"} + assert config == {"running": True, "community": "public", "port": 161, "version": "2c"} @pytest.mark.parametrize( "output", [ - "Index Community-Name Access\n----- -------------- ------\n", - "Index Community-Name Access\n", + NO_COMMUNITY, + SHOW_SNMP_COMMUNITY.splitlines(keepends=True)[0], + # A table without a column headed Name: its rows name no community. + SHOW_SNMP_COMMUNITY.replace("Name ", "Comm ", 1), "something the parser does not know\n", ], )