catalogue: salvage 28 device models stranded on seven PR-less branches #1702

Merged
jaylouisw merged 1 commit from surgery/salvage-device-batch into main 2026-11-16 18:18:27 +00:00
Owner

Salvage of the work stranded on seven branches that have no PR in 500 closed records.

What was stranded

branch last commit
devices/catalogue-batch 99ec4e70 (9 Nov)
devices/four-nvr-models 14ddbfe4
devices/nvr-and-taps 1ccef65b
devices/pon-splitters 790ae572
devices/powerline-moca e74dc3c6
devices/firewalls-enterprise 682c1272
feat/device-ubiquiti-wave-fiber-onu 9d6ddbe9

They add 28 device JSONs main has never seen - Amcrest/Hanwha/Uniview/Vivotek/Dahua NVRs, Checkpoint/SonicWall/WatchGuard firewalls, AVM + ScreenBeam powerline, Prysmian + CommScope splitters, ProfiTap taps, Fujitsu/Gigabyte servers, Moxa, Perle, FS, Trendnet, Comtrend, TP-Link. Every file here is byte-identical to its blob on those branches (verified per file with git hash-object against each branch), so this PR is the union of the seven, with no rewrites.

What is deliberately not carried

  • engine/device.js, engine/simulator.js, engine/topology.js and devices/registry.js from devices/catalogue-batch: engine work belongs to the sibling loops, and the current engine loads all 28 specs unchanged.
  • devices/ubiquiti/wave-fiber-onu.json from the feat branch: a duplicate of wavefiber-onu.json already on main (catalogue-hygiene refuses two specs for one box).

Verification

  • npm test: 285 suites, 10,234 assertions, 0 failed (readme/docs counts regenerated first with npm run regen:registry-doc).
  • node scripts/audit-port-types.js clean, node scripts/check-control-bytes.js clean.
  • Regen moved the catalogue 2,252 -> 2,280 models, 252 -> 258 vendors, 897 -> 921 port shapes.

Opened by the surgery loop; close it if these models should stay unsalvaged.

Salvage of the work stranded on seven branches that have no PR in 500 closed records. ## What was stranded | branch | last commit | |---|---| | `devices/catalogue-batch` | 99ec4e70 (9 Nov) | | `devices/four-nvr-models` | 14ddbfe4 | | `devices/nvr-and-taps` | 1ccef65b | | `devices/pon-splitters` | 790ae572 | | `devices/powerline-moca` | e74dc3c6 | | `devices/firewalls-enterprise` | 682c1272 | | `feat/device-ubiquiti-wave-fiber-onu` | 9d6ddbe9 | They add 28 device JSONs main has never seen - Amcrest/Hanwha/Uniview/Vivotek/Dahua NVRs, Checkpoint/SonicWall/WatchGuard firewalls, AVM + ScreenBeam powerline, Prysmian + CommScope splitters, ProfiTap taps, Fujitsu/Gigabyte servers, Moxa, Perle, FS, Trendnet, Comtrend, TP-Link. Every file here is byte-identical to its blob on those branches (verified per file with `git hash-object` against each branch), so this PR is the union of the seven, with no rewrites. ## What is deliberately not carried - `engine/device.js`, `engine/simulator.js`, `engine/topology.js` and `devices/registry.js` from `devices/catalogue-batch`: engine work belongs to the sibling loops, and the current engine loads all 28 specs unchanged. - `devices/ubiquiti/wave-fiber-onu.json` from the feat branch: a duplicate of `wavefiber-onu.json` already on main (catalogue-hygiene refuses two specs for one box). ## Verification - `npm test`: **285 suites, 10,234 assertions, 0 failed** (readme/docs counts regenerated first with `npm run regen:registry-doc`). - `node scripts/audit-port-types.js` clean, `node scripts/check-control-bytes.js` clean. - Regen moved the catalogue 2,252 -> 2,280 models, 252 -> 258 vendors, 897 -> 921 port shapes. Opened by the surgery loop; close it if these models should stay unsalvaged.
catalogue: salvage 28 device models stranded on seven PR-less branches
All checks were successful
CI / Classify the change (pull_request) Successful in 14s
PR rebase / Rebase onto main and arm auto-merge (pull_request) Successful in 19s
CI / Server smoke test (pull_request) Successful in 21s
CI / Docker build (pull_request) Successful in 30s
CI / Test (Node 20) (pull_request) Successful in 1m3s
CI / Test (Node 18) (pull_request) Successful in 1m8s
CI / Test (Node 22) (pull_request) Successful in 1m8s
10d2566061
Seven remote branches from 8-9 Nov carry device specs that main has never
seen and that no pull request ever referenced: devices/catalogue-batch
(28 JSONs), devices/{four-nvr-models,nvr-and-taps,pon-splitters,
powerline-moca,firewalls-enterprise} and feat/device-ubiquiti-wave-fiber-onu.
Every file below is byte-identical to its blob on those branches, so this
commit adds the union and loses nothing.

The branches also touched engine/{device,simulator,topology}.js and
devices/registry.js; none of that is carried here - the current engine loads
all 28 specs unchanged, and engine/ belongs to the sibling loops.

Dropped: feat/device-ubiquiti-wave-fiber-onu's devices/ubiquiti/wave-fiber-onu.json,
a duplicate of the wavefiber-onu.json already on main (catalogue-hygiene flags it).

docs/ and README counts regenerated with npm run regen:registry-doc
(2,252 -> 2,280 models, 252 -> 258 vendors, 897 -> 921 port shapes).
npm test: 285 suites, 10,234 assertions, 0 failed.
Author
Owner

This branch conflicts with main, so it was not rebased:

README.md devices/amcrest/nv4108e-hs.json devices/avm/fritz-powerline-1220e.json devices/avm/fritz-powerline-1260e.json devices/checkpoint/quantum-6200.json devices/commscope/sp-11600s2s2caaa.json devices/comtrend/pg-9172.json devices/dahua/nvr5232-16p-4ks2e.json devices/fs/c6ap-s24ft1u.json devices/fujitsu/primergy-rx1330-m5.json devices/fujitsu/primergy-tx1310-m5.json devices/gigabyte/r152-z30.json devices/hanwha/xrn-2010a.json devices/moxa/nport-6650-16.json devices/perle/iolan-scs16.json devices/profitap/c1r-10g.json devices/profitap/f1rl.json devices/profitap/f4l.json devices/prysmian/xspsg00009.json devices/prysmian/xspsg00010.json 

A conflict is a decision about behaviour rather than a mechanical fix, so this is left for a human. Rebasing by hand and force-pushing will let the automation pick it up again.

This branch conflicts with `main`, so it was not rebased: ``` README.md devices/amcrest/nv4108e-hs.json devices/avm/fritz-powerline-1220e.json devices/avm/fritz-powerline-1260e.json devices/checkpoint/quantum-6200.json devices/commscope/sp-11600s2s2caaa.json devices/comtrend/pg-9172.json devices/dahua/nvr5232-16p-4ks2e.json devices/fs/c6ap-s24ft1u.json devices/fujitsu/primergy-rx1330-m5.json devices/fujitsu/primergy-tx1310-m5.json devices/gigabyte/r152-z30.json devices/hanwha/xrn-2010a.json devices/moxa/nport-6650-16.json devices/perle/iolan-scs16.json devices/profitap/c1r-10g.json devices/profitap/f1rl.json devices/profitap/f4l.json devices/prysmian/xspsg00009.json devices/prysmian/xspsg00010.json ``` A conflict is a decision about behaviour rather than a mechanical fix, so this is left for a human. Rebasing by hand and force-pushing will let the automation pick it up again.
jaylouisw force-pushed surgery/salvage-device-batch from 10d2566061
All checks were successful
CI / Classify the change (pull_request) Successful in 14s
PR rebase / Rebase onto main and arm auto-merge (pull_request) Successful in 19s
CI / Server smoke test (pull_request) Successful in 21s
CI / Docker build (pull_request) Successful in 30s
CI / Test (Node 20) (pull_request) Successful in 1m3s
CI / Test (Node 18) (pull_request) Successful in 1m8s
CI / Test (Node 22) (pull_request) Successful in 1m8s
to 4f17172c38
All checks were successful
CI / Classify the change (pull_request) Successful in 15s
PR rebase / Rebase onto main and arm auto-merge (pull_request) Successful in 14s
CI / Server smoke test (pull_request) Successful in 17s
CI / Docker build (pull_request) Successful in 26s
CI / Test (Node 20) (pull_request) Successful in 57s
CI / Test (Node 18) (pull_request) Successful in 1m3s
CI / Test (Node 22) (pull_request) Successful in 1m2s
2026-11-16 18:17:46 +00:00
Compare
jaylouisw scheduled this pull request to auto merge when all checks succeed 2026-11-16 18:18:17 +00:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
jaylouisw/packetforge!1702
No description provided.