[COMBINE] P0: нормализованный каталог 271 устройство (0 ошибок), дедуп, вендоры Poly/Logitech/VINTEO/IVA/Hitrolink, health-эндпоинт
This commit is contained in:
1 parent
5a2f0c4cda
commit
fbe4102c64
5 files changed
+4736
No files matched your search
@@ -0,0 +1,110 @@
|
||||
# P0-нормализация Комбайна — 18.11.2026
|
||||
|
||||
Прод-каталог **не изменён**. Это предложение: `catalog-normalized-2026-11-18.yaml`.
|
||||
|
||||
## Итог
|
||||
| | |
|
||||
|---|---|
|
||||
| Устройств в предложении | 271 |
|
||||
| Вендоров | {'yealink': 231, 'hitrolink': 14, 'poly': 14, 'logitech': 9, 'vinteo': 2, 'iva': 1} |
|
||||
| Доменов | {'unknown': 66, 'vcs': 116, 'telephony': 77, 'infra': 9, 'software': 3} |
|
||||
| С дублями/алиасами | 10 |
|
||||
|
||||
## Группы
|
||||
| Группа | Кол-во |
|
||||
|---|---|
|
||||
| T_telephony | 77 |
|
||||
| E_other | 66 |
|
||||
| D_usb_byod | 35 |
|
||||
| E_audio | 23 |
|
||||
| A_integration_terminals | 23 |
|
||||
| E_control | 10 |
|
||||
| B_video_bars_boards | 10 |
|
||||
| E_display | 8 |
|
||||
| B_video_bars | 7 |
|
||||
| E_infra | 4 |
|
||||
| E_software | 3 |
|
||||
| E_power | 3 |
|
||||
| E_mount | 2 |
|
||||
|
||||
## Дубли/алиасы (сведены)
|
||||
| Канон | Алиасы |
|
||||
|---|---|
|
||||
| CM20+CS10 | CM20CS10 · CM20+CS10 |
|
||||
| MeetingBar A40 | MeetingBar A40 (1 · MeetingBar A40 |
|
||||
| MeetingBoard Pro | PVB 860/750/650 · PVB650/750C · PVB650_750_860 (MeetingBoard Pro · MeetingBoard Pro |
|
||||
| MeetingDisplay | MeetingDisplay (1 · MeetingDisplay |
|
||||
| MeetingEye 500 | MeetingEye 500 (1 · MeetingEye 500 |
|
||||
| RCH40 E2 | RCH40pRCH40 E2 · RCH40&RCH40 E2 |
|
||||
| UVC40 E2 | UVC40 E2 (2 · UVC40 E2 |
|
||||
| VCH51 Pro | VCH51 Pro[3] · VCH51pro · VCH51 Pro (1 |
|
||||
| VCM36-W | VCM36-W · VCM36-W (1 |
|
||||
| VCR20 | VCR20[1] · VCR20[2] |
|
||||
|
||||
## SIP/H.323
|
||||
Подтверждено протоколами: **50**.
|
||||
|
||||
- CP700
|
||||
- CP900
|
||||
- CP965
|
||||
- AX83H
|
||||
- AX86R
|
||||
- SIP-T42U
|
||||
- SIP-T57W
|
||||
- SIP-T58W
|
||||
- W70B
|
||||
- SIP-T48G
|
||||
- SIP-T19P E2
|
||||
- SIP-T22P
|
||||
- SIP-T23P
|
||||
- SIP-T27G
|
||||
- SIP-T29G
|
||||
- SIP-T40G
|
||||
- SIP-T40P
|
||||
- SIP-T41P
|
||||
- SIP-T42G
|
||||
- SIP-T42S
|
||||
- SIP-T43U
|
||||
- SIP-T44W
|
||||
- SIP-T46G
|
||||
- SIP-T46S
|
||||
- SIP-T46U
|
||||
- SIP-T48S
|
||||
- SIP-T48U
|
||||
- SIP-T52S
|
||||
- SIP-T54W
|
||||
- SIP-T58W Pro
|
||||
- SIP-T73U
|
||||
- SIP-T73W
|
||||
- SIP-T74U
|
||||
- SIP-T74W
|
||||
- SIP-T77U
|
||||
- SIP-T85W
|
||||
- SIP-T87W
|
||||
- SIP-T88W
|
||||
- SIP-T88W Pro
|
||||
- SIP-T88V Pro
|
||||
- VP59
|
||||
- W53P
|
||||
- W80
|
||||
- W90
|
||||
- DDphone (T54W)
|
||||
- CP920
|
||||
- CP925
|
||||
- CP935W
|
||||
- CP935W-Base
|
||||
- CP960
|
||||
|
||||
Группа C **не сформирована**: у большинства устройств `protocols_status=unknown`.
|
||||
Кандидаты требуют выгрузки `signaling: [SIP, H.323]` из даташитов.
|
||||
|
||||
## Вендоры вне Yealink
|
||||
| Вендор | Моделей |
|
||||
|---|---|
|
||||
| poly | 14 |
|
||||
| logitech | 9 |
|
||||
| vinteo | 2 |
|
||||
| iva | 1 |
|
||||
| hitrolink | 14 |
|
||||
|
||||
Все записи `verified: false`; в подбор не идут до проверки.
|
||||
@@ -0,0 +1,57 @@
|
||||
# Вендоры из research, ещё не в каталоге. verified: false — только seed.
|
||||
vendors:
|
||||
poly:
|
||||
name: Poly
|
||||
models:
|
||||
- HP Mini IP Conferencing PC
|
||||
- HP Poly Studio 7 Room Compute
|
||||
- HP Poly Studio V72
|
||||
- HP Poly Studio X72
|
||||
- HP Poly Studio V12
|
||||
- HP USB-C Dock G5
|
||||
- Poly Studio E60
|
||||
- Poly Studio E60 Smart Camera
|
||||
- Poly Studio G62
|
||||
- Poly Studio G62 Video Conferencing System
|
||||
- Poly Studio P15
|
||||
- Poly Studio V12
|
||||
- Poly Studio V52
|
||||
- Poly Studio V72
|
||||
- Poly Studio X52
|
||||
- Poly Studio X70
|
||||
logitech:
|
||||
name: Logitech
|
||||
models:
|
||||
- Rally Bar Mini
|
||||
- PTZ Pro 2
|
||||
- PTZ Pro Camera
|
||||
- BCC950 ConferenceCam
|
||||
- ConferenceCam CC3000e
|
||||
- ConferenceCam Connect
|
||||
- Sight
|
||||
- Tap
|
||||
- Swytch
|
||||
vinteo:
|
||||
name: VINTEO
|
||||
models:
|
||||
- Сервер видеоконференций VINTEO
|
||||
- USB-микрофон VINTEO
|
||||
iva:
|
||||
name: IVA
|
||||
models:
|
||||
- IVA Advanced
|
||||
hitrolink:
|
||||
name: Hitrolink
|
||||
models:
|
||||
- HiBoard-IA86C
|
||||
- HTI-XC800
|
||||
- HTI-XC800-NDI
|
||||
- HTI-UC300
|
||||
- HTI-UC325
|
||||
- HTI-UC340
|
||||
- HTI-UC390
|
||||
- HTI-UC400
|
||||
- HTI-UC500
|
||||
- Hitrolink 2K Minibar
|
||||
- Hitrolink 4K 2 Lens Sound bar
|
||||
- Hitrolink HT-OM400
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,33 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Валидатор P0-нормализованного каталога Комбайна."""
|
||||
import sys
|
||||
import yaml
|
||||
from collections import Counter
|
||||
|
||||
P = "/root/buryan-infra/ops/combine/catalog-normalized-2026-11-18.yaml"
|
||||
data = yaml.safe_load(open(P, encoding="utf-8"))
|
||||
devs = data.get("devices") or []
|
||||
errors = []
|
||||
ids = Counter()
|
||||
models = Counter()
|
||||
for d in devs:
|
||||
for k in ("id", "vendor", "model", "domain", "line", "group", "source"):
|
||||
if not d.get(k):
|
||||
errors.append("missing %s: %s" % (k, d.get("model")))
|
||||
ids[d.get("id")] += 1
|
||||
models[d.get("model")] += 1
|
||||
if d.get("group") == "C_sip_h323" and not any(x in (d.get("protocols") or []) for x in ("SIP", "H.323")):
|
||||
errors.append("group C without SIP/H.323: %s" % d.get("model"))
|
||||
for k, n in ids.items():
|
||||
if n > 1:
|
||||
errors.append("duplicate id %s x%d" % (k, n))
|
||||
for k, n in models.items():
|
||||
if n > 1:
|
||||
errors.append("duplicate model %s x%d" % (k, n))
|
||||
print("devices:", len(devs))
|
||||
print("vendors:", dict(Counter(d.get("vendor") for d in devs)))
|
||||
print("groups:", dict(Counter(d.get("group") for d in devs)))
|
||||
print("errors:", len(errors))
|
||||
for e in errors[:40]:
|
||||
print(" -", e)
|
||||
sys.exit(1 if errors else 0)
|
||||
@@ -924,6 +924,8 @@ class H(BaseHTTPRequestHandler):
|
||||
if p == "/":
|
||||
f = os.path.join(os.path.dirname(__file__), "index.html")
|
||||
return self._out(open(f, encoding="utf-8").read().encode(), ctype="text/html; charset=utf-8")
|
||||
if p in ("/health", "/api/health"):
|
||||
return self._out({"ok": True, "service": "combine-web", "devices": len(D.devices)})
|
||||
if p == "/api/stats":
|
||||
return self._out({"devices": len(D.devices),
|
||||
"edges": sum(len(v) for v in D.edges.values()),
|
||||
|
||||
Reference in new issue
Block a user