devices(ubiquiti): one UDM-Pro row with both 10G cages, and the UDW-PRO document-slug controls (#130) #2049
Closed
jaylouisw
wants to merge 1 commit from
catalogue/1118-2252 into main
pull from: catalogue/1118-2252
merge into: jaylouisw:main
jaylouisw:main
jaylouisw:rev/1121-1812
jaylouisw:catalogue/1121-1822
jaylouisw:docs/1121-1817
jaylouisw:catalogue/1121-1752
jaylouisw:docs/1121-1747
jaylouisw:rev/1121-1742
jaylouisw:catalogue/1121-1722
jaylouisw:rev/1121-1712
jaylouisw:docs/1121-1717
jaylouisw:catalogue/1121-1652
jaylouisw:rev/1121-1642
jaylouisw:docs/1121-1647
jaylouisw:ci/1121-1646
jaylouisw:ci/1121-1427
jaylouisw:rev/1121-1412
jaylouisw:catalogue/1121-1422
jaylouisw:docs/1121-1417
jaylouisw:catalogue/1121-1352
jaylouisw:rev/1121-1342
jaylouisw:docs/1121-1347
jaylouisw:rev/1121-1212
jaylouisw:catalogue/1121-1222
jaylouisw:docs/1121-1217
jaylouisw:ci/1121-1027
jaylouisw:catalogue/1121-1022
jaylouisw:rev/1121-1013
jaylouisw:docs/1121-1017
jaylouisw:catalogue/1121-0852
jaylouisw:rev/1121-0842
jaylouisw:docs/1121-0847
jaylouisw:ci/1121-0827
jaylouisw:catalogue/1121-0822
jaylouisw:rev/1121-0812
jaylouisw:catalogue/1121-0752
jaylouisw:rev/1121-0742
jaylouisw:docs/1121-0747
jaylouisw:catalogue/1121-0722
jaylouisw:docs/1121-0717
jaylouisw:rev/1121-0712
jaylouisw:rev/1121-0642
jaylouisw:plan/1121-0637
jaylouisw:ci/1121-0627
jaylouisw:catalogue/1121-0622
jaylouisw:rev/1121-0612
jaylouisw:docs/1121-0617
jaylouisw:plan/1120-0337
jaylouisw:docs/1120-0347
jaylouisw:rev/1119-1942
jaylouisw:rev/1119-1912
jaylouisw:catalogue/1119-1752
jaylouisw:docs/1119-1347
jaylouisw:catalogue/1119-1352
jaylouisw:fix/1119-1232
jaylouisw:fix/1119-0602
jaylouisw:catalogue/1119-0452
jaylouisw:catalogue/1119-0422
jaylouisw:docs/1119-0417
jaylouisw:fix/1119-0202
jaylouisw:catalogue/1119-0222
jaylouisw:rev/1119-0042
jaylouisw:docs/1118-2047
jaylouisw:catalogue/1118-2152
jaylouisw:fix/1118-2037
jaylouisw:ci/1118-2027
jaylouisw:docs/1118-1416
jaylouisw:fix/1118-1006
jaylouisw:catalogue/1118-0326
jaylouisw:catalogue/1117-2326
jaylouisw:catalogue/1117-0025
jaylouisw:catalogue/1116-1730
jaylouisw:fix/1523-speed-downgrade-one-end
jaylouisw:fix/enable-required-and-empty-pipe-help
jaylouisw:land-all-v5
jaylouisw:land-all-v4
jaylouisw:land-all-v3
jaylouisw:land-all-v2
jaylouisw:land-all
jaylouisw:fix/board-id
jaylouisw:fix/stated-range
jaylouisw:fix/no-form-names-v2
jaylouisw:fix/voice-vlan
jaylouisw:devices/catalogue-batch
jaylouisw:devices/powerline-moca
jaylouisw:devices/firewalls-enterprise
jaylouisw:devices/pon-splitters
jaylouisw:devices/nvr-and-taps
jaylouisw:devices/four-nvr-models
jaylouisw:fix/contributing-exemption
jaylouisw:fix/stale-github-urls
jaylouisw:ci/cancel-superseded-runs
jaylouisw:gh/1438
jaylouisw:device/uisp-console-lbe-xr
jaylouisw:gh/1442
jaylouisw:docs/readme-current-counts
jaylouisw:feat/device-ubiquiti-wave-fiber-onu
jaylouisw:fix/address-ownership
jaylouisw:feat/vrrp-in-path
jaylouisw:fix/merge-research-duplicate
jaylouisw:docs/hybrid-patch-current
jaylouisw:fix/audit-port-template
jaylouisw:fix/2930f-jl256a-uplinks
jaylouisw:feat/dhcp-in-path
jaylouisw:feat/hackgpon-ubiquiti-uisp-fiber-xgs
jaylouisw:feat/hackgpon-adtran-sdx-621
jaylouisw:tool/issue-duplicate-sweep
jaylouisw:feat/device-mikrotik-rb433ah
jaylouisw:feat/hackgpon-ma5671a
jaylouisw:issues/categories-and-labels
jaylouisw:ci/run-every-suite-locally
jaylouisw:chore/http-smoke
No reviewers
Labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
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!2049
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "catalogue/1118-2252"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Refs #130
Two things this pass: the last naming-convention route for the Dream Wall Pro is now measured shut with controls, and the catalogue row a requester settles for instead was modelled twice, one copy of which could not express its own second 10G cage.
New controls for issue 130. Every earlier "no datasheet" reading was taken from a
_dsURL.https://dl.ui.com/ds/udm-pro.pdfanswers 200, 353,553 B, application/pdf while its_dstwin answers 302 to the techspecs front page - so_dsis one of two conventions, not the convention, and a 302 ondl.ui.com/ds/udw-pro_ds.pdfnever proved there was no file. The bare-slug path was then probed under five spellings (udw-pro.pdf,udwpro.pdf,udw_pro.pdf,udw-pro_ds.pdf,udw-pro-1.pdf): all 302 tohttps://techspecs.ui.com. The quick-install-guide tree, which is server-rendered and slug-addressed (dl.ui.com/qig/udw/200/6,310 B,dl.ui.com/qig/udm-pro/200/6,185 B), has no entry forqig/udw-pro/(302/313 B) orqig/udwpro/(302/312 B). Table and reasoning:research/ubiquiti-udw-pro-doc-slug-controls.md;research/open-device-requests.jsoncarries the same with the four new sources.Catalogue fix, one device.
devices/ubiquiti/described the UDM-Pro twice -UDM-Pro.jsonandunifi-dream-machine-pro.json- and the two disagreed. The file holding the model string modelled the second 10G cage as a bareethernet 10Gport with no connector: one cage, plus a 10G port nothing can seat in. The other copy had the right count under model"UniFi Dream Machine Pro"(a product name), categoryhost, and the engine'shostcapability, which means an end device that terminates packets (engine/device.js), not a console that hosts apps, on a gateway.Vendor census, read today: datasheet
https://dl.ui.com/ds/udm-pro.pdf- "Networking interface (8) LAN: GbE RJ45 ports / (1) WAN: GbE RJ45 port", "SFP+ interface (1) LAN: 10G SFP+ / (1) WAN: 10G SFP+", IDS/IPS 3.5 Gbps, 33 W max. Tech-spec pagehttps://techspecs.ui.com/unifi/cloud-gateways/udm-proprints the same count as a table - "1 GbE RJ45 = 9 (1G/100M/10M)", "10G SFP+ = 2 (10G/1G)" - and points at the same PDF. So: 9x 1G copper (1 WAN + 8 LAN, speedCaps 10/100/1000), 2x 10G SFP+ (connectorsfp+, speedCaps 1000/10000), no PoE. One file,devices/ubiquiti/UDM-Pro.json, withaliasesfor both spellings so search does not lose the deleted name; capability set follows UDM-Pro-Max and UDM-SE.scripts/merge-research.js's inline entry, which is what produced the connector-less port, is corrected to match. Registry regenerated: 2,356 models, Ubiquiti 369 -> 368.Gates:
syntax-check.js428 files OK;audit-port-types.jsno port contradicts its declared type;test/hardware-invariants.test.js26/26;test/device-aliases.test.js13/13;npm test352 suites, 12,179 assertions, 0 failed.No close here: nothing in this pull request names a UDW-PRO port or PoE wattage, and issue 130 stays open with
research/open-device-requests.jsonas its record.eeeccb21e5d5e15d71a9Conflict is not mechanical — needs Jay's decision before this can land.
Rebasing onto current main gives 2 conflicted files, both over issue #130 (UDW-PRO):
research/open-device-requests.json— themissingstring and thesourcesarray for entry130. main now carries #2051's grant-census text (SWXgrantee enumeration, the EU store tree, "no Pro hides inside the parent grant", sourcesfccid.io/SWXpages 1–5 + the Waybackuacc-psu-udwcapture). This branch carries a different investigation of the same field (dl.ui.comnaming conventions:udm-pro.pdf200/353,553 B proves_dsis not a convention, the five bare-slug probings that all 302 to techspecs,qig/udw-pro/andqig/udwpro/absent, sourcesdl.ui.com/ds/udm-pro.pdf,udw-pro.pdf,qig/udw-pro/,qig/udm-pro/).docs/DEVICE_REGISTRY.md— generated from that JSON, so it inherits the same conflict in the issue-130 row.Both narratives are true and neither replaces the other; concatenating two 3 KB
missingstrings into one cell is an editorial call, not a rebase fix, and dropping either side loses sourced work (research/ubiquiti-udw-pro-doc-slug-controls.md, added by this PR, is cited by the branch text and would be orphaned if main's version wins outright).The rest of the PR is clean and I can land it as soon as the text question is answered:
devices/ubiquiti/UDM-Pro.json(both 10G cages),devices/ubiquiti/unifi-dream-machine-pro.json→ deleted,README.md,docs/CONNECTORS.md,docs/wiki/Home.md,scripts/build-wiki.js,scripts/merge-research.js.Decision needed: keep main's #2051 census text for issue 130 and add the doc-slug findings as a separate
checked/sourcesincrement, or publish both narratives side by side in the same field? After that,docs/DEVICE_REGISTRY.mdgets regenerated, not hand-merged.surgery run 2026-11-19 03:0xZ — queued for rebase, and it overlaps #2076.
Local
git merge-treeagainstbe18b65d: conflicts indocs/DEVICE_REGISTRY.md(generated — regenerated, not merged) andresearch/open-device-requests.json(issue 130, the UDW-PRO entry).That entry was just rewritten by #2076 (
cc8e6074), which landedresearch/ubiquiti-udw-pro-absent-from-vendor-catalogue.mdand the Chile//compliance/evidence — this PR carriesresearch/ubiquiti-udw-pro-doc-slug-controls.mdand its own 130 text. The two research notes are different documents; the JSON entry is one field, so the same "which paragraph" question as #2057 applies. I will rebase the code/registry parts next run and bring the 130 text here for a decision rather than pick a winner.Note: head
d5e15d71has 0 check statuses (no pull_request run created — same zero-status class as #2069/#2073 before their re-push), 4h after it was opened.Status note, 2026-11-19 03:55Z.
The
no checkshalf of this PR is not about this PR. It is issue #2082: a head pushed by the rebase bot (d5e15d71, committerpacketforge-bot) gets no workflow run at all, which is why the last runs here are foreeeccb21(2026-11-18 23:11Z) and nothing since. The cure I verified twice tonight is in #2082: rebase onto currentmain(0 behind) and push with a non-bot committer; the full 8-check run appears in ~100 s.The merge conflict is the real blocker and it is not mechanical:
research/open-device-requests.json- a whole-file JSON rewrite on both sides, not an adjacent-insertion conflict. The two sides disagree about the text of request 130 and request 803. main now carries the #2076/#2079 wording for 130 (nine storefronts from the page's ownalternativeStores, quick-start key resolving to artwork) plus #2072's 803 paragraph. This PR carries its own long rewrite of both. Picking one side drops research; keeping both duplicates the entry. That is Jay's call, per the same rule that applies to #2057.docs/DEVICE_REGISTRY.md- generated, so regeneration would be mechanical (npm run regen:registry-doc) after the JSON is decided.No change made to the branch this run.
Superseded by #2093, which carries this PR's substance rebased onto current main. This branch has been
mergeable: falsesince it was opened - the regenerated-count hunks inREADME.md,docs/CONNECTORS.md,docs/wiki/Home.mdandscripts/build-wiki.jshave since moved under it. No force-push from this account, so the fix lands in #2093 instead:devices/ubiquiti/UDM-Pro.jsonwith 9x 1G RJ45 + 2x 10G SFP+ and both spellings as aliases,unifi-dream-machine-pro.jsonremoved,scripts/merge-research.jscorrected, plusresearch/ubiquiti-udw-pro-doc-slug-controls.mdre-measured today (every row reproduced byte for byte). Closing this one is safe once #2093 is merged.Closed as superseded. #2093 landed this change on main as
73ea47f4(devices(ubiquiti): one UDM-Pro row with two 10G cages, not a 10G copper port (#130)): same file set,UDM-Pro.jsonwith 9x 1G RJ45 + 2x 10G SFP+ and both spellings as aliases,unifi-dream-machine-pro.jsonremoved, the regenerated-count hunks re-derived on current main. Diffed this head against main for every file it touches - the only residue is the earlier "read 2026-11-18" wording and the 7-line re-verification note, both superseded by #2093's 2026-11-19 re-measurement. Nothing to rebase.Pull request closed