From e342d3003e0c69468c71db80b1c282fe50fd09d2 Mon Sep 17 00:00:00 2001
From: Christian Marangi <ansuelsmth@gmail.com>
Date: Thu, 28 May 2026 01:35:02 +0200
Subject: [PATCH] ci: cram: detach cellular specific element from generic ubus
 datamodel test

Some ubus datamodel are specific to devices with cellular support. Move
these element to the specific ubus datamodel test to fix the generic test
from failing.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Peter Steinhaeuser <ps@embedd.com>
---
 .../generic/ubus-datamodel-list-cellular.t    | 19 ++++++++++++++++++-
 .../tests/cram/generic/ubus-datamodel-list.t  | 19 +------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list-cellular.t b/.gitlab/tests/cram/generic/ubus-datamodel-list-cellular.t
index 412209dba2..5f6450e190 100644
--- a/.gitlab/tests/cram/generic/ubus-datamodel-list-cellular.t
+++ b/.gitlab/tests/cram/generic/ubus-datamodel-list-cellular.t
@@ -7,7 +7,7 @@ If test is running on a Mozart, Turris, OSPv1 or Haze, lets skip the test as the
 
 Check that ubus has expected Cellular datamodels available:
 
-  $ R "ubus list | grep -e '^Cellular' -e 'Device.Cellular' |  grep -v -e '\.[[:digit:]]'"
+  $ R "ubus list | grep -e '^Cellular' -e 'Device.Cellular' -e 'Device.SessionManagement' -e 'Device.TrustedElements' -e '^SessionManagement' -e '^TrustedElements' |  grep -v -e '\.[[:digit:]]'"
   Cellular
   Cellular.AccessPoint
   Cellular.Interface
@@ -16,3 +16,20 @@ Check that ubus has expected Cellular datamodels available:
   Cellular.Interface.SMS.Outgoing
   Cellular.Interface.SMS.Storage
   Device.Cellular
+  Device.SessionManagement
+  Device.TrustedElements
+  SessionManagement
+  SessionManagement.PDN
+  SessionManagement.PDP
+  SessionManagement.PDU
+  SessionManagement.PDU.NetworkSlice
+  SessionManagement.PDU.QoSFlow
+  SessionManagement.PDU.QoSRule
+  SessionManagement.PDU.QoSRule.Filter
+  SessionManagement.Session
+  SessionManagement.Session.IPv4Address
+  SessionManagement.Session.IPv6Address
+  SessionManagement.Session.PCO
+  TrustedElements
+  TrustedElements.SIM
+  TrustedElements.SIM.Profile
diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list.t b/.gitlab/tests/cram/generic/ubus-datamodel-list.t
index e31dcafa1f..32acd24004 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 '^WiFi.Vendor.MLO' -e '^Bridging.Bridge.[SV]' -e 'WiFi.Vendor.ReconfManager'"
+  $ R "ubus list | grep '[[:upper:]]' | grep -v -e '\.[[:digit:]]' -e '^Cellular' -e 'Device.Cellular' -e 'Device.SessionManagement' -e 'Device.TrustedElements' -e '^SessionManagement' -e '^TrustedElements' -e 'WiFi.Vendor.Daemon' -e 'WiFi.Vendor.ModuleMode' -e '^WiFi.Vendor.MLO' -e '^Bridging.Bridge.[SV]' -e 'WiFi.Vendor.ReconfManager'"
   ACLManager
   ACLManager.Role
   Bridging
@@ -119,11 +119,9 @@ Check that ubus has expected datamodels available:
   Device.SSH
   Device.Schedules
   Device.Security
-  Device.SessionManagement
   Device.SoftwareModules
   Device.Syslog
   Device.Time
-  Device.TrustedElements
   Device.UPnP
   Device.UPnP.Description
   Device.UPnP.Discovery
@@ -350,18 +348,6 @@ Check that ubus has expected datamodels available:
   Security
   Security.CABundle
   Security.Certificate
-  SessionManagement
-  SessionManagement.PDN
-  SessionManagement.PDP
-  SessionManagement.PDU
-  SessionManagement.PDU.NetworkSlice
-  SessionManagement.PDU.QoSFlow
-  SessionManagement.PDU.QoSRule
-  SessionManagement.PDU.QoSRule.Filter
-  SessionManagement.Session
-  SessionManagement.Session.IPv4Address
-  SessionManagement.Session.IPv6Address
-  SessionManagement.Session.PCO
   SoftwareModules
   SoftwareModules.Config
   SoftwareModules.Config.Repository
@@ -395,9 +381,6 @@ Check that ubus has expected datamodels available:
   Timingila.RlyehPluginsConfig
   Timingila.RlyehPluginsInfo
   Timingila.RlyehPluginsInfo.LoadedPlugins
-  TrustedElements
-  TrustedElements.SIM
-  TrustedElements.SIM.Profile
   UPnP
   UPnP.Device
   UPnP.Device.Capabilities