From a5023bb579bb2540e2997597fa79da65d138c356 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 15 May 2025 14:01:17 +0200 Subject: [PATCH] ci: cram: Move Cellular datamodel check to dedicated test Split and move obuspa and ubus-datamodel Cellular entry to dedicated test. This is needed as some Device might not support Cellular and will have a different datamodel. Fixes: 88b968a5db58 ("ci: cram: update expected test results after cellular integration") Signed-off-by: Christian Marangi --- .gitlab/tests/cram/generic/obuspa-cellular.t | 133 ++++++++++++++++++ .gitlab/tests/cram/generic/obuspa.t | 124 +--------------- .../generic/ubus-datamodel-list-cellular.t | 17 +++ .../tests/cram/generic/ubus-datamodel-list.t | 9 +- 4 files changed, 154 insertions(+), 129 deletions(-) create mode 100644 .gitlab/tests/cram/generic/obuspa-cellular.t create mode 100644 .gitlab/tests/cram/generic/ubus-datamodel-list-cellular.t diff --git a/.gitlab/tests/cram/generic/obuspa-cellular.t b/.gitlab/tests/cram/generic/obuspa-cellular.t new file mode 100644 index 0000000000..5b5eee0b62 --- /dev/null +++ b/.gitlab/tests/cram/generic/obuspa-cellular.t @@ -0,0 +1,133 @@ +Create R alias: + + $ alias R="${CRAM_REMOTE_COMMAND:-}" + +Check that obuspa has expected datamodel available for cellular: + + $ R "obuspa -f /etc/obuspa.db -c dump datamodel | grep '^Device.Cellular.'" + Device.Cellular. proto::cellular-manager + Device.Cellular.AccessPoint.{i}. proto::cellular-manager + Device.Cellular.AccessPoint.{i}.APN proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Alias proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Enable proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Interface proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Password proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Proxy proto::cellular-manager + Device.Cellular.AccessPoint.{i}.ProxyPort proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Username proto::cellular-manager + Device.Cellular.AccessPoint.{i}.X_PRPLWARE-COM_IPType proto::cellular-manager + Device.Cellular.AccessPointNumberOfEntries proto::cellular-manager + Device.Cellular.Interface.{i}. proto::cellular-manager + Device.Cellular.Interface.{i}.Alias proto::cellular-manager + Device.Cellular.Interface.{i}.AvailableNetworks proto::cellular-manager + Device.Cellular.Interface.{i}.CurrentAccessTechnology proto::cellular-manager + Device.Cellular.Interface.{i}.DownstreamMaxBitRate proto::cellular-manager + Device.Cellular.Interface.{i}.Enable proto::cellular-manager + Device.Cellular.Interface.{i}.IMEI proto::cellular-manager + Device.Cellular.Interface.{i}.LastChange proto::cellular-manager + Device.Cellular.Interface.{i}.LowerLayers proto::cellular-manager + Device.Cellular.Interface.{i}.Name proto::cellular-manager + Device.Cellular.Interface.{i}.NetworkInUse proto::cellular-manager + Device.Cellular.Interface.{i}.NetworkRequested proto::cellular-manager + Device.Cellular.Interface.{i}.PreferredAccessTechnology proto::cellular-manager + Device.Cellular.Interface.{i}.RSRP proto::cellular-manager + Device.Cellular.Interface.{i}.RSRQ proto::cellular-manager + Device.Cellular.Interface.{i}.RSSI proto::cellular-manager + Device.Cellular.Interface.{i}.Stats. proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.BroadcastPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.BroadcastPacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.BytesReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.BytesSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.DiscardPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.DiscardPacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.ErrorsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.ErrorsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.MulticastPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.MulticastPacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.PacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.PacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.UnicastPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.UnicastPacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.UnknownProtoPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Status proto::cellular-manager + Device.Cellular.Interface.{i}.SupportedAccessTechnologies proto::cellular-manager + Device.Cellular.Interface.{i}.USIM. proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.ICCID proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.IMSI proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.MSISDN proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.PIN proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.PINCheck proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.Status proto::cellular-manager + Device.Cellular.Interface.{i}.Upstream proto::cellular-manager + Device.Cellular.Interface.{i}.UpstreamMaxBitRate proto::cellular-manager + Device.Cellular.Interface.{i}.X_PRPLWARE-COM_SignalQualityPollingRate proto::cellular-manager + Device.Cellular.InterfaceNumberOfEntries proto::cellular-manager + Device.Cellular.RoamingEnabled proto::cellular-manager + Device.Cellular.RoamingStatus proto::cellular-manager + +Check that USP stack is handling the reconnection scenario properly PCF-1198/PPW-65 by restarting obuspa: + + $ R "service obuspa restart" ; sleep 20 + +Check that obuspa provides the same datamodel for cellular again: + + $ R "obuspa -f /etc/obuspa.db -c dump datamodel | grep '^Device.Cellular.'" + Device.Cellular. proto::cellular-manager + Device.Cellular.AccessPoint.{i}. proto::cellular-manager + Device.Cellular.AccessPoint.{i}.APN proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Alias proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Enable proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Interface proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Password proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Proxy proto::cellular-manager + Device.Cellular.AccessPoint.{i}.ProxyPort proto::cellular-manager + Device.Cellular.AccessPoint.{i}.Username proto::cellular-manager + Device.Cellular.AccessPoint.{i}.X_PRPLWARE-COM_IPType proto::cellular-manager + Device.Cellular.AccessPointNumberOfEntries proto::cellular-manager + Device.Cellular.Interface.{i}. proto::cellular-manager + Device.Cellular.Interface.{i}.Alias proto::cellular-manager + Device.Cellular.Interface.{i}.AvailableNetworks proto::cellular-manager + Device.Cellular.Interface.{i}.CurrentAccessTechnology proto::cellular-manager + Device.Cellular.Interface.{i}.DownstreamMaxBitRate proto::cellular-manager + Device.Cellular.Interface.{i}.Enable proto::cellular-manager + Device.Cellular.Interface.{i}.IMEI proto::cellular-manager + Device.Cellular.Interface.{i}.LastChange proto::cellular-manager + Device.Cellular.Interface.{i}.LowerLayers proto::cellular-manager + Device.Cellular.Interface.{i}.Name proto::cellular-manager + Device.Cellular.Interface.{i}.NetworkInUse proto::cellular-manager + Device.Cellular.Interface.{i}.NetworkRequested proto::cellular-manager + Device.Cellular.Interface.{i}.PreferredAccessTechnology proto::cellular-manager + Device.Cellular.Interface.{i}.RSRP proto::cellular-manager + Device.Cellular.Interface.{i}.RSRQ proto::cellular-manager + Device.Cellular.Interface.{i}.RSSI proto::cellular-manager + Device.Cellular.Interface.{i}.Stats. proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.BroadcastPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.BroadcastPacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.BytesReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.BytesSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.DiscardPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.DiscardPacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.ErrorsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.ErrorsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.MulticastPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.MulticastPacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.PacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.PacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.UnicastPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.UnicastPacketsSent proto::cellular-manager + Device.Cellular.Interface.{i}.Stats.UnknownProtoPacketsReceived proto::cellular-manager + Device.Cellular.Interface.{i}.Status proto::cellular-manager + Device.Cellular.Interface.{i}.SupportedAccessTechnologies proto::cellular-manager + Device.Cellular.Interface.{i}.USIM. proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.ICCID proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.IMSI proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.MSISDN proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.PIN proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.PINCheck proto::cellular-manager + Device.Cellular.Interface.{i}.USIM.Status proto::cellular-manager + Device.Cellular.Interface.{i}.Upstream proto::cellular-manager + Device.Cellular.Interface.{i}.UpstreamMaxBitRate proto::cellular-manager + Device.Cellular.Interface.{i}.X_PRPLWARE-COM_SignalQualityPollingRate proto::cellular-manager + Device.Cellular.InterfaceNumberOfEntries proto::cellular-manager + Device.Cellular.RoamingEnabled proto::cellular-manager + Device.Cellular.RoamingStatus proto::cellular-manager diff --git a/.gitlab/tests/cram/generic/obuspa.t b/.gitlab/tests/cram/generic/obuspa.t index bab39c585d..02d36d2352 100644 --- a/.gitlab/tests/cram/generic/obuspa.t +++ b/.gitlab/tests/cram/generic/obuspa.t @@ -2,9 +2,9 @@ Create R alias: $ alias R="${CRAM_REMOTE_COMMAND:-}" -Check that obuspa has expected datamodel available (minus the platform specific WiFi Vendor extensions): +Check that obuspa has expected datamodel available (minus the platform specific WiFi Vendor extensions/cellular): - $ R "obuspa -f /etc/obuspa.db -c dump datamodel | grep '^Device.' | grep -v -e 'Device.WiFi.AccessPoint.{i}.Vendor.' -e 'Device.WiFi.EndPoint.{i}.Vendor.' -e 'Device.WiFi.Radio.{i}.Vendor.' -e 'Device.WiFi.Radio.{i}.NaStaMonitor.'" + $ R "obuspa -f /etc/obuspa.db -c dump datamodel | grep '^Device.' | grep -v -e 'Device.Cellular.' -e 'Device.WiFi.AccessPoint.{i}.Vendor.' -e 'Device.WiFi.EndPoint.{i}.Vendor.' -e 'Device.WiFi.Radio.{i}.Vendor.' -e 'Device.WiFi.Radio.{i}.NaStaMonitor.'" Device. Device.Boot! proto::tr181-device Device.Bridging. proto::tr181-bridging @@ -127,65 +127,6 @@ Check that obuspa has expected datamodel available (minus the platform specific Device.CaptivePortal.Enable proto::tr181-captiveportal Device.CaptivePortal.Status proto::tr181-captiveportal Device.CaptivePortal.URL proto::tr181-captiveportal - Device.Cellular. proto::cellular-manager - Device.Cellular.AccessPoint.{i}. proto::cellular-manager - Device.Cellular.AccessPoint.{i}.APN proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Alias proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Enable proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Interface proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Password proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Proxy proto::cellular-manager - Device.Cellular.AccessPoint.{i}.ProxyPort proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Username proto::cellular-manager - Device.Cellular.AccessPoint.{i}.X_PRPLWARE-COM_IPType proto::cellular-manager - Device.Cellular.AccessPointNumberOfEntries proto::cellular-manager - Device.Cellular.Interface.{i}. proto::cellular-manager - Device.Cellular.Interface.{i}.Alias proto::cellular-manager - Device.Cellular.Interface.{i}.AvailableNetworks proto::cellular-manager - Device.Cellular.Interface.{i}.CurrentAccessTechnology proto::cellular-manager - Device.Cellular.Interface.{i}.DownstreamMaxBitRate proto::cellular-manager - Device.Cellular.Interface.{i}.Enable proto::cellular-manager - Device.Cellular.Interface.{i}.IMEI proto::cellular-manager - Device.Cellular.Interface.{i}.LastChange proto::cellular-manager - Device.Cellular.Interface.{i}.LowerLayers proto::cellular-manager - Device.Cellular.Interface.{i}.Name proto::cellular-manager - Device.Cellular.Interface.{i}.NetworkInUse proto::cellular-manager - Device.Cellular.Interface.{i}.NetworkRequested proto::cellular-manager - Device.Cellular.Interface.{i}.PreferredAccessTechnology proto::cellular-manager - Device.Cellular.Interface.{i}.RSRP proto::cellular-manager - Device.Cellular.Interface.{i}.RSRQ proto::cellular-manager - Device.Cellular.Interface.{i}.RSSI proto::cellular-manager - Device.Cellular.Interface.{i}.Stats. proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.BroadcastPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.BroadcastPacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.BytesReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.BytesSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.DiscardPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.DiscardPacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.ErrorsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.ErrorsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.MulticastPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.MulticastPacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.PacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.PacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.UnicastPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.UnicastPacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.UnknownProtoPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Status proto::cellular-manager - Device.Cellular.Interface.{i}.SupportedAccessTechnologies proto::cellular-manager - Device.Cellular.Interface.{i}.USIM. proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.ICCID proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.IMSI proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.MSISDN proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.PIN proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.PINCheck proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.Status proto::cellular-manager - Device.Cellular.Interface.{i}.Upstream proto::cellular-manager - Device.Cellular.Interface.{i}.UpstreamMaxBitRate proto::cellular-manager - Device.Cellular.Interface.{i}.X_PRPLWARE-COM_SignalQualityPollingRate proto::cellular-manager - Device.Cellular.InterfaceNumberOfEntries proto::cellular-manager - Device.Cellular.RoamingEnabled proto::cellular-manager - Device.Cellular.RoamingStatus proto::cellular-manager Device.DHCPv4. Device.DHCPv4.Client.{i}. proto::tr181-dhcpv4client Device.DHCPv4.Client.{i}.Alias proto::tr181-dhcpv4client @@ -4469,7 +4410,7 @@ Check that USP stack is handling the reconnection scenario properly PCF-1198/PPW Check that obuspa provides the same datamodel again (minus the platform specific WiFi Vendor extensions): - $ R "obuspa -f /etc/obuspa.db -c dump datamodel | grep '^Device.' | grep -v -e 'Device.WiFi.AccessPoint.{i}.Vendor.' -e 'Device.WiFi.EndPoint.{i}.Vendor.' -e 'Device.WiFi.Radio.{i}.Vendor.' -e 'Device.WiFi.Radio.{i}.NaStaMonitor.'" + $ R "obuspa -f /etc/obuspa.db -c dump datamodel | grep '^Device.' | grep -v -e 'Device.Cellular.' -e 'Device.WiFi.AccessPoint.{i}.Vendor.' -e 'Device.WiFi.EndPoint.{i}.Vendor.' -e 'Device.WiFi.Radio.{i}.Vendor.' -e 'Device.WiFi.Radio.{i}.NaStaMonitor.'" Device. Device.Boot! proto::tr181-device Device.Bridging. proto::tr181-bridging @@ -4592,65 +4533,6 @@ Check that obuspa provides the same datamodel again (minus the platform specific Device.CaptivePortal.Enable proto::tr181-captiveportal Device.CaptivePortal.Status proto::tr181-captiveportal Device.CaptivePortal.URL proto::tr181-captiveportal - Device.Cellular. proto::cellular-manager - Device.Cellular.AccessPoint.{i}. proto::cellular-manager - Device.Cellular.AccessPoint.{i}.APN proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Alias proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Enable proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Interface proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Password proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Proxy proto::cellular-manager - Device.Cellular.AccessPoint.{i}.ProxyPort proto::cellular-manager - Device.Cellular.AccessPoint.{i}.Username proto::cellular-manager - Device.Cellular.AccessPoint.{i}.X_PRPLWARE-COM_IPType proto::cellular-manager - Device.Cellular.AccessPointNumberOfEntries proto::cellular-manager - Device.Cellular.Interface.{i}. proto::cellular-manager - Device.Cellular.Interface.{i}.Alias proto::cellular-manager - Device.Cellular.Interface.{i}.AvailableNetworks proto::cellular-manager - Device.Cellular.Interface.{i}.CurrentAccessTechnology proto::cellular-manager - Device.Cellular.Interface.{i}.DownstreamMaxBitRate proto::cellular-manager - Device.Cellular.Interface.{i}.Enable proto::cellular-manager - Device.Cellular.Interface.{i}.IMEI proto::cellular-manager - Device.Cellular.Interface.{i}.LastChange proto::cellular-manager - Device.Cellular.Interface.{i}.LowerLayers proto::cellular-manager - Device.Cellular.Interface.{i}.Name proto::cellular-manager - Device.Cellular.Interface.{i}.NetworkInUse proto::cellular-manager - Device.Cellular.Interface.{i}.NetworkRequested proto::cellular-manager - Device.Cellular.Interface.{i}.PreferredAccessTechnology proto::cellular-manager - Device.Cellular.Interface.{i}.RSRP proto::cellular-manager - Device.Cellular.Interface.{i}.RSRQ proto::cellular-manager - Device.Cellular.Interface.{i}.RSSI proto::cellular-manager - Device.Cellular.Interface.{i}.Stats. proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.BroadcastPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.BroadcastPacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.BytesReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.BytesSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.DiscardPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.DiscardPacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.ErrorsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.ErrorsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.MulticastPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.MulticastPacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.PacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.PacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.UnicastPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.UnicastPacketsSent proto::cellular-manager - Device.Cellular.Interface.{i}.Stats.UnknownProtoPacketsReceived proto::cellular-manager - Device.Cellular.Interface.{i}.Status proto::cellular-manager - Device.Cellular.Interface.{i}.SupportedAccessTechnologies proto::cellular-manager - Device.Cellular.Interface.{i}.USIM. proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.ICCID proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.IMSI proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.MSISDN proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.PIN proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.PINCheck proto::cellular-manager - Device.Cellular.Interface.{i}.USIM.Status proto::cellular-manager - Device.Cellular.Interface.{i}.Upstream proto::cellular-manager - Device.Cellular.Interface.{i}.UpstreamMaxBitRate proto::cellular-manager - Device.Cellular.Interface.{i}.X_PRPLWARE-COM_SignalQualityPollingRate proto::cellular-manager - Device.Cellular.InterfaceNumberOfEntries proto::cellular-manager - Device.Cellular.RoamingEnabled proto::cellular-manager - Device.Cellular.RoamingStatus proto::cellular-manager Device.DHCPv4. Device.DHCPv4.Client.{i}. proto::tr181-dhcpv4client Device.DHCPv4.Client.{i}.Alias proto::tr181-dhcpv4client diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list-cellular.t b/.gitlab/tests/cram/generic/ubus-datamodel-list-cellular.t new file mode 100644 index 0000000000..83bbb90b77 --- /dev/null +++ b/.gitlab/tests/cram/generic/ubus-datamodel-list-cellular.t @@ -0,0 +1,17 @@ +Create R alias: + + $ alias R="${CRAM_REMOTE_COMMAND:-}" + +If test is running on a Mozart, skip it as no cellular support: + $ if echo "$CI_JOB_NAME" | grep -q -E "Mozart"; then exit 80; fi + +Check that ubus has expected Cellular datamodels available: + + $ R "ubus list | grep -e '^Cellular' -e 'Device.Cellular' | grep -v -e '\.[[:digit:]]'" + Cellular + Cellular.AccessPoint + Cellular.Interface + Cellular.Interface.Bearer.IPv4 + Cellular.Interface.Bearer.IPv6 + Cellular.Interface.Stats + Device.Cellular diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list.t b/.gitlab/tests/cram/generic/ubus-datamodel-list.t index edfceee7c4..bce911b922 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 'WiFi.Vendor.Daemon' -e 'WiFi.Vendor.ModuleMode' -e '^Bridging.Bridge.[SV]'" + $ 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]'" ACLManager ACLManager.Role Bridging @@ -16,12 +16,6 @@ Check that ubus has expected datamodels available: Buttons.Button CaptivePortal CaptivePortal.LANInterface - Cellular - Cellular.AccessPoint - Cellular.Interface - Cellular.Interface.Bearer.IPv4 - Cellular.Interface.Bearer.IPv6 - Cellular.Interface.Stats Cthulhu Cthulhu.Config Cthulhu.Config.Debug @@ -68,7 +62,6 @@ Check that ubus has expected datamodels available: Device.Bridging Device.BulkData Device.CaptivePortal - Device.Cellular Device.DHCPv4 Device.DHCPv4.Server Device.DHCPv6