diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index b637e1ff53c5de712befab920a09e955a26b5ed7..179a2ab666ad8d26a930fd10847bd934557b03c8 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -10,14 +10,15 @@ module _3gpp-common-subscription-control { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines IOCs for subscription and heartbeat control. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions 3GPP TS 28.623"; - + + revision 2025-03-31 { reference CR-0518 ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } @@ -94,6 +95,32 @@ module _3gpp-common-subscription-control { } } + typedef NotificationTypes { + description "An extensible enumeration of notification types"; + type union { + type enumeration { + enum notifyMOICreation; + enum notifyMOIDeletion; + enum notifyMOIAttributeValueChanges; + enum notifyMOIChanges; + enum notifyEvent; + enum notifyNewAlarm; + enum notifyChangedAlarm; + enum notifyAckStateChanged; + enum notifyComments; + enum notifyCorrelatedNotificationChanged; + enum notifyChangedAlarmGeneral; + enum notifyClearedAlarm; + enum notifyAlarmListRebuilt; + enum notifyPotentialFaultyAlarmList; + enum notifyFileReady; + enum notifyFilePreparationError; + enum notifyThresholdCrossing ; + } + type string; + } + } + grouping NtfSubscriptionControlGrp { description "Attributes of a specific notification subscription"; @@ -103,14 +130,14 @@ module _3gpp-common-subscription-control { } leaf-list notificationTypes { - type string; - description "Defines the types of notifications that are candidates - for being forwarded to the notification recipient. - If the notificationTypes attribute is not supported or not present - all candidate notifications types are forwarded to the notification; - discriminated by notificationFilter attribute."; + type NotificationTypes; + description "Defines the types of notifications that are candidates + for being forwarded to the notification recipient. + If the notificationTypes attribute is not supported or not present + all candidate notifications types are forwarded to the notification; + discriminated by notificationFilter attribute."; } - + list scope { description "Scopes (selects) data nodes in an object tree."; key idx; @@ -289,7 +316,7 @@ module _3gpp-common-subscription-control { description "Attributes of SupportedNotifications."; leaf-list notificationTypes { - type string; + type NotificationTypes; config false; description "List of notification types supported by the MnS producer"; }