This board (NE63T8751SG/AA-class) reports no /information/vs/0 at all -- the modelNum-based routing fallback has nothing to read -- so it fell back to 'unknown' and lost the whole range registry (oven mode/setpoint/ door/connected, cooktop monitoring). /oic/d does carry oic.d.range, though, so this is a routing fix, not a new capability: adds 'oic.d.range' to _OIC_TYPE_TO_KEY. The second oven cavity is a genuine Pattern A indexed subdevice at /device/1 (issue #177's mechanism) -- once routing resolves the master to the range registry, the same registry already applies to the subdevice's canonical view and every href on both binds with zero gaps. _discover_full gains an optional device_types param (default (), every other fixture unaffected) so a fixture that can only route via /oic/d can exercise the same subdevice-aware pipeline the other composite fixtures already do.
153 lines
5.8 KiB
Python
153 lines
5.8 KiB
Python
import json
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
FIXTURES = Path(__file__).resolve().parent / "fixtures"
|
|
|
|
|
|
def _resources_from_dump(dump: dict) -> dict[str, dict]:
|
|
from custom_components.localthings.registry.batch import parse_device0_batch
|
|
|
|
return parse_device0_batch(dump["device0"])
|
|
|
|
|
|
def _load_device(name: str) -> dict[str, dict]:
|
|
data = json.loads((FIXTURES / f"{name}_device.json").read_text())
|
|
return _resources_from_dump(data)
|
|
|
|
|
|
def _load_device_full(name: str):
|
|
"""Like _load_device, but also returns the optional `oic_res`/`seeds`
|
|
keys a subdevice-capable fixture (issue #177) may carry alongside
|
|
`device0` -- see the two `airconditioner_*` fixtures with a
|
|
`seeds_note` field. `oic_res`/`seeds` default to `[]`/`{}` for every
|
|
other fixture, so this is safe to call on any fixture in the corpus.
|
|
|
|
Returns `(resources, oic_res, seeds)` where `seeds` is
|
|
`{seed_href: raw_batch_list}` -- the same [devcol-rep, {href, rep}, ...]
|
|
shape a real /device/<n> or /<id>/device/0 RETRIEVE returns, ready to
|
|
hand to a FakeCoapSession.
|
|
|
|
A fixture's optional `probes` map (plain Property-map resources that
|
|
belong to no batch, e.g. the hand-read /multidevice/vs/0 in the
|
|
ARTIK051_DONGLE_FAC_18K fixture) is folded into `seeds` here, since
|
|
FakeCoapSession answers both shapes off the same href key.
|
|
"""
|
|
data = json.loads((FIXTURES / f"{name}_device.json").read_text())
|
|
resources = _resources_from_dump(data)
|
|
seeds = {**data.get("seeds", {}), **data.get("probes", {})}
|
|
return resources, data.get("oic_res", []), seeds
|
|
|
|
|
|
class FakeCoapSession:
|
|
"""Minimal stand-in for smartthings_local's DtlsCoapSession, backed by a
|
|
fixture's `seeds` map (raw device0-batch-shaped lists keyed by seed
|
|
href -- plus any `probes` entries, which are plain Property maps rather
|
|
than batch lists; both are just CBOR bodies at this layer, and the two
|
|
readers in registry.subdevices already type-check what they get back).
|
|
Enough surface for registry.subdevices.enumerate_subdevices and
|
|
LocalThingsCoordinator's blocking subdevice polls to run against fixture
|
|
data without a live device -- same idea as test_identity.py's
|
|
FakeSession, but keyed by href string (post path-join) rather than a
|
|
path tuple, since callers here pass a `seed_path` tuple straight
|
|
through.
|
|
"""
|
|
|
|
def __init__(self, seeds: dict[str, list] | None = None):
|
|
self.seeds = seeds or {}
|
|
|
|
def get(self, path, timeout=None):
|
|
href = "/" + "/".join(path)
|
|
body = self.seeds.get(href)
|
|
if body is None:
|
|
return 0x84, b"" # 4.04 not found -- tolerated absence
|
|
import cbor2
|
|
|
|
return 0x45, cbor2.dumps(body)
|
|
|
|
def pace(self):
|
|
pass
|
|
|
|
|
|
def _discover_full(resources: dict[str, dict], oic_res, seeds: dict[str, list], device_types=()):
|
|
"""Run the *whole* subdevice-aware discovery pipeline against fixture
|
|
data, HA-free -- mirrors exactly what LocalThingsCoordinator does across
|
|
_enumerate_subdevices_blocking + _run_discovery (issue #177), so a test
|
|
exercising this exercises the real code path, not a re-implementation of
|
|
it. See the adding-device-support skill's section 2 for the plain
|
|
(non-subdevice) equivalent this extends.
|
|
|
|
`device_types` is the master's own /oic/d `rt` (see
|
|
discover_partitioned's `oic_device_types` param) -- only needed for a
|
|
board with no /information/vs/0 at all to route from (issue #324's
|
|
range, whose modelNum-based fallback has nothing to read), so it
|
|
defaults to () for every fixture that resolves by board token instead.
|
|
|
|
Returns `(bound, materialized, skipped, full_resources, device_type_name)`:
|
|
- `bound`: every BoundEntity, main + every materialized subdevice.
|
|
- `materialized`/`skipped`: Subdevice / SkippedSubdevice lists straight from
|
|
discover_partitioned.
|
|
- `full_resources`: `resources` merged with every candidate's seed data
|
|
(actual hrefs) -- what a coordinator's cache would hold.
|
|
- `device_type_name`: the master's resolved registry name.
|
|
"""
|
|
from custom_components.localthings.registry.by_type import resolve
|
|
from custom_components.localthings.registry.registry import CAPABILITIES
|
|
from custom_components.localthings.registry.subdevices import (
|
|
discover_partitioned,
|
|
enumerate_subdevices,
|
|
)
|
|
|
|
sess = FakeCoapSession(seeds)
|
|
candidates, extra = enumerate_subdevices(sess, resources, oic_res)
|
|
full_resources = {**resources, **extra}
|
|
bound, device_type_name, materialized, skipped = discover_partitioned(
|
|
full_resources,
|
|
candidates,
|
|
resolve,
|
|
CAPABILITIES,
|
|
oic_device_types=device_types,
|
|
)
|
|
return bound, materialized, skipped, full_resources, device_type_name
|
|
|
|
|
|
def _load_resources(ip: str) -> dict[str, dict]:
|
|
"""Legacy IP-based loader — maps known IPs to named fixtures."""
|
|
_ip_to_name = {
|
|
"10.0.0.129": "dishwasher",
|
|
"10.0.0.254": "refrigerator",
|
|
}
|
|
name = _ip_to_name.get(ip)
|
|
if name is None:
|
|
raise ValueError(f"No fixture for IP {ip!r} — add a scrubbed fixture to tests/fixtures/")
|
|
return _load_device(name)
|
|
|
|
|
|
@pytest.fixture
|
|
def dishwasher_resources() -> dict[str, dict]:
|
|
return _load_device("dishwasher")
|
|
|
|
|
|
@pytest.fixture
|
|
def fridge_resources() -> dict[str, dict]:
|
|
return _load_device("refrigerator")
|
|
|
|
|
|
@pytest.fixture
|
|
def washer_resources() -> dict[str, dict]:
|
|
return _load_device("washer")
|
|
|
|
|
|
@pytest.fixture
|
|
def all_device_fixtures() -> dict[str, dict[str, dict]]:
|
|
"""Every scrubbed device dump, keyed by fixture name.
|
|
|
|
For invariants that must hold across the whole corpus rather than for one
|
|
device -- so a newly added dump exercises them automatically.
|
|
"""
|
|
return {
|
|
path.name[: -len("_device.json")]: _resources_from_dump(json.loads(path.read_text()))
|
|
for path in sorted(FIXTURES.glob("*_device.json"))
|
|
}
|