feat(device-discovery): vrf discovery for extreme_slx, dell_ftos, brocade_netiron, extreme_vsp by leoparente · Pull Request #456 · netboxlabs/orb-discovery

leoparente · 2026-06-11T16:35:54Z

Summary

Final custom-driver batch implementing get_network_instances() for VRF discovery (follows #452/#453/#454/#455). This completes the planned driver coverage: 22 drivers now support options.discover_vrfs; everything else is documented as permanently-N/A or demand-driven.

Per driver

Driver	Data source	Notes
`extreme_slx`	Vrf column of `show ip interface brief` (ntc-template)	The fixture is the upstream real-device capture. Same rows IP discovery parses, so member names join exactly. `default-vrf` = global table; `mgmt-vrf` kept. Management rows pre-stripped (template error-exits on them, mirroring the IP getter). Membership-derived enumeration; RD not collected.
`dell_ftos`	`show ip vrf`, driver-local parse	Abbreviated members (`Gi 1/2`) expand to the full template forms interface discovery keys by — including OS9's lowercase-first speed names (`fortyGigE`). Wrapped continuation lines, trailing-number ranges (cross-slot ranges deliberately not expanded), paging-orphan continuations dropped. `default` (id 0) = global table; `management` (511) kept.
`brocade_netiron`	`show vrf`, driver-local parse	Default RD carried (`(null)`/`Not Set` sentinels → absent); member shorthand (`ve2`, `e1/1`) canonicalised through the driver's existing bare-id name map so names join `get_interfaces()` output. `default-vrf` = global table.
`extreme_vsp`	`show ip vrf` + per-VRF `show ip interface vrf <name>`	Members parsed with the same row parser the IP getter uses. `GlobalRouter` = global table; `MgmtRouter` kept.

Validation caveat — stated plainly

extreme_slx is grounded in a real capture. dell_ftos, brocade_netiron, and extreme_vsp are built from vendor-documented output formats — mockit and ntc-templates carry no VRF command captures for these platforms. Each is marked in code and docs as needing live-device validation; parsers are deliberately conservative (unparseable tokens pass through and simply never join rather than guessing).

Tests

8 fixture scenarios; driver ownership pin matrix now 22 drivers
Full suite: 1786 passed, 161 skipped; ruff clean

Review trail

Two adversarial Claude rounds. Round 1 caught a HIGH (FTOS abbreviated member names provably could never join the driver's own full-name interface keys — the feature would have silently no-op'd on every OS9 box) plus NetIron Not Set RD dropping whole VRF rows, cross-slot range fabrication, and stale-continuation attachment — all fixed with probes. Round 2: APPROVED, with its remaining LOW/INFO hardenings (OS9 lowercase speed casing, phantom-VRF orphan drop, NotSet sentinel) also applied. A codex final-gate pass was started but stopped for time; the two-round adversarial trail stands as the quality gate.

🤖 Generated with Claude Code

…cade_netiron, extreme_vsp Final custom-driver batch implementing get_network_instances(): - extreme_slx: VRF membership from the Vrf column of "show ip interface brief" (the extreme_slxos ntc-template, validated against the upstream real-device capture), the same rows the IP getter consumes. default-vrf is the global table; mgmt-vrf is kept. Management rows are pre-stripped like the IP getter does. - dell_ftos: driver-local parse of "show ip vrf" — abbreviated comma-separated members with wrapped continuation lines and trailing-number ranges (Gi 1/3-1/5) expanded; continuation lines are discriminated from rows by being member-tokens-only. default (id 0) is the global table; management (id 511) is kept. - brocade_netiron: driver-local parse of "show vrf" (name, default RD with (null) sentinel handling, wrapped member lists); member shorthand (ve2, e1/1) canonicalised through the same bare-id map get_interfaces_vlans() uses so names join get_interfaces() output. - extreme_vsp: "show ip vrf" enumerates VRFs; one "show ip interface vrf <name>" per VRF lists members via the same row parser the IP getter uses. GlobalRouter is the global table; MgmtRouter is kept. SLX is grounded in a real capture; the other three are built from vendor-documented formats and marked as needing live-device validation in code and docs. Eight fixture scenarios; pin matrix now 22 drivers. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

github-actions · 2026-06-11T16:36:59Z

Coverage Report

File	Stmts	Miss	Cover	Missing
device_discovery
client.py	66	10	85%	169–188
discovery.py	76	5	93%	102–104, 174–177
entity_metadata.py	13	2	85%	24, 27
interface.py	217	5	98%	141–145, 491–492
main.py	49	2	96%	182, 188
metrics.py	53	1	98%	133
server.py	88	10	89%	44–46, 72–87, 184, 187
stubs.py	160	10	94%	31, 64, 84, 146, 256, 301, 324–329, 341–346
translate.py	283	7	98%	141, 143, 256, 478, 556, 567, 608
translate_chassis.py	175	6	97%	42, 45, 54–55, 149, 405
translate_modules.py	107	1	99%	217
version.py	7	1	86%	14
vrf.py	72	3	96%	67–68, 99
device_discovery/policy
manager.py	61	3	95%	37–38, 161
portscan.py	84	11	87%	34–35, 59–60, 64, 72–76, 117
run.py	88	2	98%	158, 193
runner.py	253	23	91%	276–280, 285–286, 303–304, 397, 631, 650–682
TOTAL	1988	102	95%

Tests	Skipped	Failures	Errors	Time
1948	161 💤	0 ❌	0 🔥	24.912s ⏱️

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 860b70a5f9

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Copilot

Pull request overview

Implements get_network_instances() (NAPALM OpenConfig network-instances shape) for the final batch of custom drivers to support opt-in VRF discovery via options.discover_vrfs, and adds fixtures/tests to pin behavior for each platform’s CLI output.

Changes:

Added get_network_instances() implementations for extreme_slx, dell_ftos, brocade_netiron, and extreme_vsp.
Added per-driver mock CLI captures + expected results for “normal” and “no_vrfs” scenarios.
Extended the VRF-dispatch runner test matrix to include the four newly-supported drivers.

Reviewed changes

Copilot reviewed 20 out of 20 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
device-discovery/tests/test_runner_vrf_dispatch.py	Expands the pinned support matrix to include the four new VRF-capable drivers.
device-discovery/tests/custom_drivers/extreme_vsp/mock_data/test_get_network_instances/normal/show_ip_vrf.txt	Fixture for VSP VRF enumeration output.
device-discovery/tests/custom_drivers/extreme_vsp/mock_data/test_get_network_instances/normal/show_ip_interface_vrf_vrf-red.txt	Fixture for per-VRF interface membership (`vrf-red`).
device-discovery/tests/custom_drivers/extreme_vsp/mock_data/test_get_network_instances/normal/show_ip_interface_vrf_MgmtRouter.txt	Fixture for per-VRF interface membership (`MgmtRouter`).
device-discovery/tests/custom_drivers/extreme_vsp/mock_data/test_get_network_instances/normal/expected_result.json	Expected `get_network_instances()` result for VSP “normal” case.
device-discovery/tests/custom_drivers/extreme_vsp/mock_data/test_get_network_instances/no_vrfs/expected_result.json	Expected `get_network_instances()` result for VSP “no_vrfs” case.
device-discovery/tests/custom_drivers/extreme_slx/mock_data/test_get_network_instances/normal/show_ip_interface_brief.txt	Fixture for SLX VRF membership derived from `show ip interface brief`.
device-discovery/tests/custom_drivers/extreme_slx/mock_data/test_get_network_instances/normal/expected_result.json	Expected `get_network_instances()` result for SLX “normal” case.
device-discovery/tests/custom_drivers/extreme_slx/mock_data/test_get_network_instances/no_vrfs/expected_result.json	Expected `get_network_instances()` result for SLX “no_vrfs” case.
device-discovery/tests/custom_drivers/dell_ftos/mock_data/test_get_network_instances/normal/show_ip_vrf.txt	Fixture for OS9 `show ip vrf` output (wrapped members / ranges).
device-discovery/tests/custom_drivers/dell_ftos/mock_data/test_get_network_instances/normal/expected_result.json	Expected `get_network_instances()` result for FTOS “normal” case.
device-discovery/tests/custom_drivers/dell_ftos/mock_data/test_get_network_instances/no_vrfs/expected_result.json	Expected `get_network_instances()` result for FTOS “no_vrfs” case.
device-discovery/tests/custom_drivers/brocade_netiron/mock_data/test_get_network_instances/normal/show_vrf.txt	Fixture for NetIron `show vrf` output (with wrapped interface list).
device-discovery/tests/custom_drivers/brocade_netiron/mock_data/test_get_network_instances/normal/show_interfaces.txt	Fixture backing canonical interface-name mapping for NetIron member normalization.
device-discovery/tests/custom_drivers/brocade_netiron/mock_data/test_get_network_instances/normal/expected_result.json	Expected `get_network_instances()` result for NetIron “normal” case (incl. RD handling).
device-discovery/tests/custom_drivers/brocade_netiron/mock_data/test_get_network_instances/no_vrfs/expected_result.json	Expected `get_network_instances()` result for NetIron “no_vrfs” case.
device-discovery/custom_napalm/extreme_vsp.py	Adds VSP VRF parsing + `get_network_instances()` implementation.
device-discovery/custom_napalm/extreme_slx.py	Adds SLX `get_network_instances()` derived from the `show ip interface brief` parsed rows.
device-discovery/custom_napalm/dell_ftos.py	Adds OS9 VRF parser (wrapping + range expansion + abbrev expansion) + `get_network_instances()`.
device-discovery/custom_napalm/brocade_netiron.py	Adds NetIron VRF parser + canonicalization of member tokens + `get_network_instances()`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

…rows; vsp indented rows Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

leoparente · 2026-06-11T16:52:14Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5fd51aa831

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…y; ftos indentation-gated continuations Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

leoparente · 2026-06-11T17:01:21Z

@codex review

Copilot

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 1 comment.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

leoparente · 2026-06-11T17:12:36Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 017d47d3ba

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Copilot

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 1 comment.

…single-vrf request skips n+1 calls Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

leoparente · 2026-06-11T17:25:37Z

@codex review

chatgpt-codex-connector · 2026-06-11T17:29:42Z

Codex Review: Didn't find any major issues. Chef's kiss.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Copilot

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 1 comment.

…inherited members Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated no new comments.

leoparente requested review from MicahParks, grant-nbl, jajeffries, marc-barry, mfiedorowicz, paulstuart and samiura as code owners June 11, 2026 16:35

leoparente requested a review from Copilot June 11, 2026 16:36

leoparente mentioned this pull request Jun 11, 2026

docs(device-discovery): vrf discovery via the discover_vrfs option netboxlabs/orb-agent#398

Draft

Copilot started reviewing on behalf of leoparente June 11, 2026 16:36 View session

leoparente self-assigned this Jun 11, 2026

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

Comment thread device-discovery/custom_napalm/extreme_slx.py Outdated

Copilot AI reviewed Jun 11, 2026

View reviewed changes

Comment thread device-discovery/custom_napalm/extreme_vsp.py Outdated

Comment thread device-discovery/custom_napalm/extreme_slx.py Outdated

fix(device-discovery): recover slx mgmt-vrf from stripped management …

5fd51aa

…rows; vsp indented rows Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

Comment thread device-discovery/custom_napalm/dell_ftos.py

Comment thread device-discovery/custom_napalm/extreme_slx.py Outdated

fix(device-discovery): slx template-failure fallback for vrf discover…

ad21ae7

…y; ftos indentation-gated continuations Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

leoparente requested a review from Copilot June 11, 2026 17:01

Copilot started reviewing on behalf of leoparente June 11, 2026 17:01 View session

Copilot AI reviewed Jun 11, 2026

View reviewed changes

Comment thread device-discovery/custom_napalm/extreme_slx.py Outdated

docs(device-discovery): clarify slx vrf fallback regex coverage comment

017d47d

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

leoparente requested a review from Copilot June 11, 2026 17:12

Copilot started reviewing on behalf of leoparente June 11, 2026 17:13 View session

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

Comment thread device-discovery/custom_napalm/dell_ftos.py Outdated

Copilot AI reviewed Jun 11, 2026

View reviewed changes

Comment thread device-discovery/custom_napalm/extreme_vsp.py

fix(device-discovery): expand ftos comma-compressed vrf members; vsp …

ee051be

…single-vrf request skips n+1 calls Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

leoparente requested a review from Copilot June 11, 2026 17:26

Copilot started reviewing on behalf of leoparente June 11, 2026 17:26 View session

Copilot AI reviewed Jun 11, 2026

View reviewed changes

Comment thread device-discovery/custom_napalm/dell_ftos.py

fix(device-discovery): derive ftos range head from the left side for …

6015275

…inherited members Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

mfiedorowicz approved these changes Jun 11, 2026

View reviewed changes

leoparente requested a review from Copilot June 11, 2026 17:33

Copilot started reviewing on behalf of leoparente June 11, 2026 17:33 View session

Copilot AI reviewed Jun 11, 2026

View reviewed changes

leoparente merged commit 0506d23 into develop Jun 11, 2026
10 checks passed

leoparente deleted the feat/device-discovery-vrf-drivers-batch4 branch June 11, 2026 17:41

Conversation

leoparente commented Jun 11, 2026

Summary

Per driver

Validation caveat — stated plainly

Tests

Review trail

Uh oh!

github-actions Bot commented Jun 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

leoparente commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

leoparente commented Jun 11, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

leoparente commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

leoparente commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 11, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions Bot commented Jun 11, 2026 •

edited

Loading