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

Harden LLDP collect ops: edge list, job reclaim, and schedule hygiene.

Browse source 
Add fabric link browsing, conservative job retention, hour-based intervals, multi-worker start locking, and trim canvas discover UI in favor of the LLDP page.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-02 03:58:03 +08:00
parent d05ba0f1f7
commit e7f97b7cf6
18 changed files with 1126 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

40
netx_api/topology_migrate.py
View file

@ -31,13 +31,21 @@ def ensure_topology_schema(conn: Connection) -> None:
# Best-effort column add for existing DBs (create_all won't alter).
alter_stmts: list[str] = []
if dialect.startswith("postgres"):
alter_stmts.append(
"ALTER TABLE topo_discover_job ADD COLUMN IF NOT EXISTS trigger_mode VARCHAR(32) DEFAULT 'manual'"
alter_stmts.extend(
[
"ALTER TABLE topo_discover_job ADD COLUMN IF NOT EXISTS trigger_mode VARCHAR(32) DEFAULT 'manual'",
"ALTER TABLE lldp_collect_policy ADD COLUMN IF NOT EXISTS history_keep INTEGER DEFAULT 30",
"ALTER TABLE lldp_collect_policy ADD COLUMN IF NOT EXISTS interval_hours INTEGER DEFAULT 24",
]
)
elif dialect.startswith("sqlite"):
# SQLite: ignore if column already exists.
alter_stmts.append(
"ALTER TABLE topo_discover_job ADD COLUMN trigger_mode VARCHAR(32) DEFAULT 'manual'"
alter_stmts.extend(
[
"ALTER TABLE topo_discover_job ADD COLUMN trigger_mode VARCHAR(32) DEFAULT 'manual'",
"ALTER TABLE lldp_collect_policy ADD COLUMN history_keep INTEGER DEFAULT 30",
"ALTER TABLE lldp_collect_policy ADD COLUMN interval_hours INTEGER DEFAULT 24",
]
)
for sql in alter_stmts:
try:
@ -45,6 +53,30 @@ def ensure_topology_schema(conn: Connection) -> None:
except Exception:
_log.debug("topology alter skipped/failed: %s", sql[:80], exc_info=True)
# Backfill hours from legacy days when hours unset/zero.
try:
conn.execute(
text(
"UPDATE lldp_collect_policy SET interval_hours = "
"CASE WHEN COALESCE(interval_hours, 0) <= 0 "
"THEN GREATEST(1, COALESCE(interval_days, 1)) * 24 "
"ELSE interval_hours END"
)
)
except Exception:
try:
# SQLite has no GREATEST in older builds — use MAX.
conn.execute(
text(
"UPDATE lldp_collect_policy SET interval_hours = "
"CASE WHEN COALESCE(interval_hours, 0) <= 0 "
"THEN MAX(1, COALESCE(interval_days, 1)) * 24 "
"ELSE interval_hours END"
)
)
except Exception:
_log.debug("interval_hours backfill skipped", exc_info=True)
if not dialect.startswith("postgres"):
return
stmts = [