hansjone/netx
1
0
Fork 0
mirror of https://github.com/hansjone/netx.git synced 2026-10-09 03:10:46 +08:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions 2

Elegant multi-command collect: slim aux, declarative enrich, CollectSession.

Browse source 
AuxCommand is key+profile_id only; EnrichJoin copies fields after primary parse; ARP no longer hardcodes if_intf join.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-09-17 23:49:01 +08:00
parent 1f70f7fc25
commit 17d136cf6b
8 changed files with 600 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

38
netx_api/biz_state/profiles.py
View file

@ -8,6 +8,8 @@ from __future__ import annotations
from dataclasses import dataclass, field
from typing import Any
from .enrich import EnrichJoin
@dataclass(frozen=True)
class FieldDef:
@ -36,14 +38,10 @@ class PlaceholderDef:
@dataclass(frozen=True)
class AuxCommand:
"""Secondary CLI bound to a collect profile (same session, optional cache)."""
"""Secondary collect: only key + profile_id (rest from that profile)."""
key: str
command_template: str
textfsm_command: str = ""
parser_id: str = ""
rule_keys: tuple[str, ...] = ()
profile_id: str = ""
profile_id: str
@dataclass
@ -65,6 +63,7 @@ class ParseProfile:
enabled: bool = True
kind: str = "collect" # collect | discover
aux_commands: list[AuxCommand] = field(default_factory=list)
enrich_joins: list[EnrichJoin] = field(default_factory=list)
_LLDP_FIELDS: list[FieldDef] = [
@ -358,14 +357,10 @@ def _zte_status_profiles() -> list[ParseProfile]:
enabled=True,
kind="collect",
aux_commands=[
AuxCommand(
key="if_intf",
command_template="show running-config if-intf",
textfsm_command="show running-config if-intf",
parser_id="if_intf",
rule_keys=("zte_zxros_show_running_config_if_intf",),
profile_id="zte.if_intf",
)
AuxCommand(key="if_intf", profile_id="zte.if_intf"),
],
enrich_joins=[
EnrichJoin(from_aux="if_intf", on="interface", take=("vrf",)),
],
),
ParseProfile(
@ -546,12 +541,19 @@ def profile_to_public_dict(p: ParseProfile, *, overrides: dict[str, Any] | None
"aux_commands": [
{
"key": a.key,
"command_template": a.command_template,
"textfsm_command": a.textfsm_command or a.command_template,
"parser_id": a.parser_id,
"rule_keys": list(a.rule_keys),
"profile_id": a.profile_id,
}
for a in (p.aux_commands or [])
],
"enrich_joins": [
{
"from_aux": j.from_aux,
"on": j.on,
"left_on": j.left_on,
"right_on": j.right_on,
"take": list(j.take),
"fill_missing": j.fill_missing,
}
for j in (p.enrich_joins or [])
],
}