diff --git a/.gitlab/tests/cram/generic/fixtures/obuspa.expected b/.gitlab/tests/cram/generic/fixtures/obuspa.expected index cae873cf8c..3dcc5473ad 100644 --- a/.gitlab/tests/cram/generic/fixtures/obuspa.expected +++ b/.gitlab/tests/cram/generic/fixtures/obuspa.expected @@ -3940,8 +3940,8 @@ Device.WiFi.DataElements.Network.AccessPoint.{i}.Security.KeyPassphrase Device.WiFi.DataElements.Network.AccessPoint.{i}.Security.ModeEnabled proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.AccessPoint.{i}.Security.PreSharedKey proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.AccessPoint.{i}.Security.SAEPassphrase proto::prplmesh-dm-mapper -Device.WiFi.DataElements.Network.AccessPoint.{i}.X-PRPL_ORG_GroupName proto::prplmesh-dm-mapper -Device.WiFi.DataElements.Network.AccessPoint.{i}.X_PRPLWARE_VapType proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.AccessPoint.{i}.X_PRPLWARE-COM_GroupName proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.AccessPoint.{i}.X_PRPLWARE-COM_VapType proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.AccessPointCommit() proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.AccessPointNumberOfEntries proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.ClientSteering() proto::prplmesh-dm-mapper @@ -4168,6 +4168,10 @@ Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiAPSteering.BT Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiAPSteering.BlacklistAttempts proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MulticastBytesReceived proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MulticastBytesSent proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.QMDescriptor.{i}. proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.QMDescriptor.{i}.BSSID proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.QMDescriptor.{i}.ClientMAC proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.QMDescriptor.{i}.DescriptorElement proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SSID proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}. proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.BytesReceived proto::prplmesh-dm-mapper @@ -4285,6 +4289,20 @@ Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capab Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STANumberOfEntries proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetEHTOperations() proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetEHTOperations() input:DisabledSubchannelBitmap +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQMDescriptors() proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQMDescriptors() input:QMDescriptor +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagement() proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagement() input:DSCPPolicyEnable +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagement() input:MSCSEnable +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagement() input:QosMapEnable +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagement() input:SCSEnable +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagement() input:SCSTrafficDescriptionEnable +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagementInput. proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagementInput.DSCPPolicyEnable proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagementInput.MSCSEnable proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagementInput.QosMapEnable proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagementInput.SCSEnable proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SetQoSManagementInput.SCSTrafficDescriptionEnable proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.TimeStamp proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.TriggerVBSSDestruction() proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.TriggerVBSSDestruction() input:client_mac @@ -4607,6 +4625,7 @@ Device.WiFi.DataElements.Network.Device.{i}.bSTAMLDMaxLinks Device.WiFi.DataElements.Network.DeviceNumberOfEntries proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.Enable proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.ID proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.MSCSDisallowedStaList proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats. proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BTMAttempts proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BTMFailures proto::prplmesh-dm-mapper @@ -4616,12 +4635,17 @@ Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BlacklistAttempts Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BlacklistFailures proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BlacklistSuccesses proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.NoCandidateAPFailures proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.SCSDisallowedStaList proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.SetMSCSDisallowed() proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.SetMSCSDisallowed() input:MSCSDisallowedStaList +Device.WiFi.DataElements.Network.SetSCSDisallowed() proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.SetSCSDisallowed() input:SCSDisallowedStaList Device.WiFi.DataElements.Network.SetServicePrioritization() proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.TimeStamp proto::prplmesh-dm-mapper Device.WiFi.DataElements.Network.UpdateUnassociatedStationsStats() proto::prplmesh-dm-mapper -Device.WiFi.DataElements.Network.X-PRPL_ORG_Group.{i}. proto::prplmesh-dm-mapper -Device.WiFi.DataElements.Network.X-PRPL_ORG_Group.{i}.Enable proto::prplmesh-dm-mapper -Device.WiFi.DataElements.Network.X-PRPL_ORG_Group.{i}.Name proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.X_PRPLWARE-COM_Group.{i}. proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.X_PRPLWARE-COM_Group.{i}.Enable proto::prplmesh-dm-mapper +Device.WiFi.DataElements.Network.X_PRPLWARE-COM_Group.{i}.Name proto::prplmesh-dm-mapper Device.WiFi.DataElements.X_PRPLWARE-COM_Controller. proto::prplmesh-dm-mapper Device.WiFi.DataElements.X_PRPLWARE-COM_Controller.AgentConnectedEvent.{i}. proto::prplmesh-dm-mapper Device.WiFi.DataElements.X_PRPLWARE-COM_Controller.AgentConnectedEvent.{i}.AgentConnected.{i}. proto::prplmesh-dm-mapper diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list.t b/.gitlab/tests/cram/generic/ubus-datamodel-list.t index 82f56fdf02..efb1771bb0 100644 --- a/.gitlab/tests/cram/generic/ubus-datamodel-list.t +++ b/.gitlab/tests/cram/generic/ubus-datamodel-list.t @@ -507,6 +507,7 @@ Check that ubus has expected datamodels available: X_PRPLWARE-COM_WiFiController.Network.Device.Radio X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.MultiAPSteering + X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.QMDescriptor X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.STA X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.STA.HTCapabilities X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.STA.MeasurementReport @@ -517,6 +518,7 @@ Check that ubus has expected datamodels available: X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.STA.VHTCapabilities X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.STA.WiFi6Capabilities X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.STA.WiFi6Capabilities.MCSNSS + X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BSS.SetQoSManagementInput X_PRPLWARE-COM_WiFiController.Network.Device.Radio.BackhaulSta X_PRPLWARE-COM_WiFiController.Network.Device.Radio.CACCapability X_PRPLWARE-COM_WiFiController.Network.Device.Radio.CACCapability.CACMethod @@ -563,7 +565,7 @@ Check that ubus has expected datamodels available: X_PRPLWARE-COM_WiFiController.Network.Device.bSTAMLD X_PRPLWARE-COM_WiFiController.Network.Device.bSTAMLD.bSTAMLDConfig X_PRPLWARE-COM_WiFiController.Network.MultiAPSteeringSummaryStats - X_PRPLWARE-COM_WiFiController.Network.X-PRPL_ORG_Group + X_PRPLWARE-COM_WiFiController.Network.X_PRPLWARE-COM_Group X_PRPLWARE-COM_WiFiMapped X_PRPLWARE-COM_WiFiMapped.WiFi X_PRPLWARE-COM_WiFiMapped.WiFi.DataElements diff --git a/profiles/prpl_core.yml b/profiles/prpl_core.yml index fd9e595eec..dadd64a87d 100644 --- a/profiles/prpl_core.yml +++ b/profiles/prpl_core.yml @@ -7,7 +7,7 @@ feeds: - name: feed_prplmesh uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplmesh.git - revision: main@c7bfcd24b0e2b4ef10af8e8249e80326d3031ca5 + revision: main@7581453ae7d1db2f9b998438309e474adc92b73c - name: feed_prplos uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplos.git