From cd0337b15958782a58297f9def8d503e5c1917f6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 24 Mar 2025 07:07:48 +0000 Subject: [PATCH 1/6] Update file _3gpp-common-subscription-control.yang --- .../_3gpp-common-subscription-control.yang | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index b637e1ff5..ccf0acfd5 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -103,7 +103,25 @@ module _3gpp-common-subscription-control { } leaf-list notificationTypes { - type string; + 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 + } 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 -- GitLab From a22dc988b07290f4751b0b0cd1fcf2d85998b0a4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 24 Mar 2025 07:10:27 +0000 Subject: [PATCH 2/6] Update file _3gpp-common-subscription-control.yang --- yang-models/_3gpp-common-subscription-control.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index ccf0acfd5..6ef992c15 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -119,8 +119,8 @@ module _3gpp-common-subscription-control { enum notifyAlarmListRebuilt; enum notifyPotentialFaultyAlarmList； enum notifyFileReady； - enum notifyFilePreparationError； - enum notifyThresholdCrossing + enum notifyFilePreparationError; + enum notifyThresholdCrossing; } description "Defines the types of notifications that are candidates for being forwarded to the notification recipient. -- GitLab From a478a246fd739720ff43881d478053427012c8e8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 24 Mar 2025 07:13:24 +0000 Subject: [PATCH 3/6] Update file _3gpp-common-subscription-control.yang --- yang-models/_3gpp-common-subscription-control.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 6ef992c15..a162af405 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -117,8 +117,8 @@ module _3gpp-common-subscription-control { enum notifyChangedAlarmGeneral; enum notifyClearedAlarm; enum notifyAlarmListRebuilt; - enum notifyPotentialFaultyAlarmList； - enum notifyFileReady； + enum notifyPotentialFaultyAlarmList; + enum notifyFileReady; enum notifyFilePreparationError; enum notifyThresholdCrossing; } -- GitLab From ee330cbf12405639d3143f385d660b06d2a80ee4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 10 Apr 2025 19:53:57 +0000 Subject: [PATCH 4/6] Update file _3gpp-common-subscription-control.yang --- .../_3gpp-common-subscription-control.yang | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index a162af405..aa1fcb3fe 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -17,7 +17,7 @@ module _3gpp-common-subscription-control { Integration Reference Point (IRP); Solution Set (SS) definitions 3GPP TS 28.623"; - + revision 2025-03-27 { 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 ; } @@ -102,32 +102,32 @@ module _3gpp-common-subscription-control { mandatory true; } - leaf-list notificationTypes { + 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; + enum NOTIFY_MOI_CREATION; + enum NOTIFY_MOI_DELETION; + enum NOTIFY_MOI_ATTRIBUTE_VALUE_CHANGES; + enum NOTIFY_MOI_CHANGES; + enum NOTIFY_EVENT; + enum NOTIFY_NEW_ALARM; + enum NOTIFY_CHANGED_ALARM; + enum NOTIFY_ACKSTATE_CHANGED; + enum NOTIFY_COMMENTS; + enum NOTIFY_CORRELATED_NOTIFICATION_CHANGED; + enum NOTIFY_CHANGED_ALARM_GENERAL; + enum NOTIFY_CLEARED_ALARM; + enum NOTIFY_ALARMLIST_REBUILT; + enum NOTIFY_POTENTIAL_FAULTY_ALARMLIST; + enum NOTIFY_FILEREADY; + enum NOTIFY_FILE_PREPARATION_ERROR; + enum NOTIFY_THRESHOLD_CROSSING; } - 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 string; } + } + list scope { description "Scopes (selects) data nodes in an object tree."; -- GitLab From 8d9bad25213e8069b07b3111e511af2550e0f55d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 10 Apr 2025 20:07:01 +0000 Subject: [PATCH 5/6] Update file _3gpp-common-subscription-control.yang --- yang-models/_3gpp-common-subscription-control.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index aa1fcb3fe..974ae4d2c 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -17,6 +17,7 @@ module _3gpp-common-subscription-control { Integration Reference Point (IRP); Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2025-03-27 { reference CR-0518 ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } -- GitLab From c85aaa69e1601ce17ee29fb9ddadaf270f987825 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 11 Apr 2025 07:36:26 +0000 Subject: [PATCH 6/6] Update _3gpp-common-subscription-control.yang Missing leaflist notification types --- .../_3gpp-common-subscription-control.yang | 66 +++++++++++-------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 974ae4d2c..179a2ab66 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -10,7 +10,7 @@ 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) @@ -18,7 +18,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2025-03-27 { reference CR-0518 ; } + 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 ; } @@ -95,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,33 +129,15 @@ module _3gpp-common-subscription-control { mandatory true; } - typedef NotificationTypes { - description "An extensible enumeration of notification types"; - type union { - type enumeration { - enum NOTIFY_MOI_CREATION; - enum NOTIFY_MOI_DELETION; - enum NOTIFY_MOI_ATTRIBUTE_VALUE_CHANGES; - enum NOTIFY_MOI_CHANGES; - enum NOTIFY_EVENT; - enum NOTIFY_NEW_ALARM; - enum NOTIFY_CHANGED_ALARM; - enum NOTIFY_ACKSTATE_CHANGED; - enum NOTIFY_COMMENTS; - enum NOTIFY_CORRELATED_NOTIFICATION_CHANGED; - enum NOTIFY_CHANGED_ALARM_GENERAL; - enum NOTIFY_CLEARED_ALARM; - enum NOTIFY_ALARMLIST_REBUILT; - enum NOTIFY_POTENTIAL_FAULTY_ALARMLIST; - enum NOTIFY_FILEREADY; - enum NOTIFY_FILE_PREPARATION_ERROR; - enum NOTIFY_THRESHOLD_CROSSING; - } - type string; + leaf-list notificationTypes { + 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; @@ -308,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"; } -- GitLab