From 436db5fd76ab58644597fa7978784b39874f3a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 21 May 2026 22:12:28 +0200 Subject: [PATCH] PROVISORY: ci: cram: temporarily filter MLO vendor datamodels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the generic cram data-model checks compare shared ubus and obuspa output with fixed baselines. These checks already filter WiFi Vendor objects that are platform specific, because the generic tests should not fail just because one target exposes extra vendor internals. The MXL25641-HDK-6 jobs now expose Device.WiFi.Vendor.MLO through both obuspa and ubus. That is unexpected: prplmesh-dm-mapper lists the MLO subtree in dmm-object-hide, so these objects should be hidden from the public data-model listings in the first place. So lets add provisional test-side filters for the MLO vendor subtree. This keeps the generic tests board-neutral while the mapper visibility issue is investigated. The filters should be removed again once hidden MLO objects no longer leak into the obuspa and ubus listings. Link: https://gitlab.com/prpl-foundation/prplmesh/prplmesh-dm-mapper/-/blob/e39c50857f36277a0eb525a59be9f55d7ef6bb7f/odl/prplmesh-pwhm-mapping.odl#L601 Link: https://gitlab.com/prpl-foundation/prplos/prplos/-/jobs/14478170366#L882 Link: https://gitlab.com/prpl-foundation/prplos/prplos/-/jobs/14492345808#L1333 References: PPW-1996 Assisted-by: gpt-5.5:high:fast Signed-off-by: Petr Štetiar --- .gitlab/tests/cram/generic/ubus-datamodel-list.t | 2 +- .gitlab/tests/cram/scripts/target/obuspa-datamodel-dump.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list.t b/.gitlab/tests/cram/generic/ubus-datamodel-list.t index 4317e5780a..0537104d47 100644 --- a/.gitlab/tests/cram/generic/ubus-datamodel-list.t +++ b/.gitlab/tests/cram/generic/ubus-datamodel-list.t @@ -4,7 +4,7 @@ Create R alias: Check that ubus has expected datamodels available: - $ R "ubus list | grep '[[:upper:]]' | grep -v -e '\.[[:digit:]]' -e '^Cellular' -e 'Device.Cellular' -e 'WiFi.Vendor.Daemon' -e 'WiFi.Vendor.ModuleMode' -e '^Bridging.Bridge.[SV]' -e 'WiFi.Vendor.ReconfManager'" + $ R "ubus list | grep '[[:upper:]]' | grep -v -e '\.[[:digit:]]' -e '^Cellular' -e 'Device.Cellular' -e 'WiFi.Vendor.Daemon' -e 'WiFi.Vendor.ModuleMode' -e 'WiFi.Vendor.MLO' -e '^Bridging.Bridge.[SV]' -e 'WiFi.Vendor.ReconfManager'" ACLManager ACLManager.Role Bridging diff --git a/.gitlab/tests/cram/scripts/target/obuspa-datamodel-dump.sh b/.gitlab/tests/cram/scripts/target/obuspa-datamodel-dump.sh index 0d568e7a99..cdd8c10d64 100644 --- a/.gitlab/tests/cram/scripts/target/obuspa-datamodel-dump.sh +++ b/.gitlab/tests/cram/scripts/target/obuspa-datamodel-dump.sh @@ -8,6 +8,7 @@ case "${1:-generic}" in -e 'Device.WiFi.EndPoint.{i}.Vendor.' \ -e 'Device.WiFi.Radio.{i}.Vendor.' \ -e 'Device.WiFi.Radio.{i}.NaStaMonitor.' \ + -e 'Device.WiFi.Vendor.MLO.' \ -e 'Device.WiFi.Vendor.ReconfManager.' ;; cellular)