feat(lldp): report the neighbour's chassis MAC in lldp_neighbors
driver / standard (pull_request) Successful in 20s
driver / lint (pull_request) Failing after 15s
driver / types (pull_request) Successful in 1m13s
driver / test (3.12) (pull_request) Successful in 1m19s
driver / test (3.13) (pull_request) Successful in 1m12s
driver / lowest (pull_request) Successful in 38s
driver / build (pull_request) Successful in 31s
driver / security (pull_request) Successful in 1m13s
CI / driver (pull_request) Failing after 3m1s
driver / publish (pull_request) Skipped

An application matches an LLDP neighbour by its chassis MAC first, and
napalm-linux and napalm-netgear report it as mac; the projection did
not, so every driver built on it would have reported neighbours by name
only (NAPALM/napalm-openwrt#31). lldp_neighbors now carries mac, lower
case, when the chassis id is a MAC address (LldpNeighborDict).
This commit is contained in:
christianmanivong committed 2026-11-02 08:50:50 +01:00
1 parent 4427be35cc
commit 2542081c6f
5 files changed
+55 -15

No files matched your search

+7 -1
View File
@@ -135,7 +135,12 @@ from napalm_device_types.listening import (
ListeningSocketsUnavailable,
parse_listening_sockets,
)
from napalm_device_types.lldp import LldpNeighborRow, lldp_neighbors, lldp_neighbors_detail
from napalm_device_types.lldp import (
LldpNeighborDict,
LldpNeighborRow,
lldp_neighbors,
lldp_neighbors_detail,
)
from napalm_device_types.lldpctl import LLDPCTL_KEYVALUE_COMMAND, parse_lldpctl_keyvalue
from napalm_device_types.local_accounts import (
LocalAccountChangeDict,
@@ -351,6 +356,7 @@ __all__ = [
"ListeningSocketsUnavailable",
"parse_listening_sockets",
"LLDPCTL_KEYVALUE_COMMAND",
"LldpNeighborDict",
"LldpNeighborRow",
"lldp_neighbors",
"lldp_neighbors_detail",
+27 -9
View File
@@ -10,10 +10,14 @@ several entries in both shapes.
from __future__ import annotations
import re
from collections.abc import Iterable
from typing import TypedDict
from typing import NotRequired, TypedDict
from napalm.base.models import LLDPNeighborDetailDict, LLDPNeighborDict
from napalm.base.models import LLDPNeighborDetailDict
#: A chassis id of type ``mac`` that really is a MAC address.
_MAC_RE = re.compile(r"^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$")
class LldpNeighborRow(TypedDict):
@@ -39,13 +43,27 @@ class LldpNeighborRow(TypedDict):
enabled_capabilities: list[str]
def lldp_neighbors(rows: Iterable[LldpNeighborRow]) -> dict[str, list[LLDPNeighborDict]]:
"""``get_lldp_neighbors``: per local port, every neighbour's name and port."""
neighbors: dict[str, list[LLDPNeighborDict]] = {}
class LldpNeighborDict(TypedDict):
"""NAPALM's ``get_lldp_neighbors`` entry (``hostname``, ``port``), plus the chassis MAC.
``mac`` (lower case) is there only when the neighbour names its chassis by a
MAC address; an application can match the neighbour by it, where a name
may be ambiguous.
"""
hostname: str
port: str
mac: NotRequired[str]
def lldp_neighbors(rows: Iterable[LldpNeighborRow]) -> dict[str, list[LldpNeighborDict]]:
"""``get_lldp_neighbors``: per local port, every neighbour's name, port and chassis MAC."""
neighbors: dict[str, list[LldpNeighborDict]] = {}
for row in rows:
neighbors.setdefault(row["local_port"], []).append(
{"hostname": row["system_name"], "port": row["port_id"]}
)
entry: LldpNeighborDict = {"hostname": row["system_name"], "port": row["port_id"]}
if row["chassis_id_type"] == "mac" and _MAC_RE.match(row["chassis_id"]):
entry["mac"] = row["chassis_id"].lower()
neighbors.setdefault(row["local_port"], []).append(entry)
return neighbors
@@ -76,4 +94,4 @@ def lldp_neighbors_detail(
return details
__all__ = ["LldpNeighborRow", "lldp_neighbors", "lldp_neighbors_detail"]
__all__ = ["LldpNeighborDict", "LldpNeighborRow", "lldp_neighbors", "lldp_neighbors_detail"]