diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index b067ace3f9eee9798d228269ed4324fb6b19717c..f6853d59bdac1e05f3e45db13ecc4e180061e86e 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,6 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-07-01 { reference "CR-0050 CR-0051"; } revision 2025-05-01 { reference "CR-0042 CR-0043"; } // common for R18, R19 revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { @@ -156,8 +157,8 @@ module _3gpp-common-fm { } } mandatory true; - description "Higher value of a threshold with hysteris, the integer type - is used for counter thresholds and the float type for gauge + description "Higher value of a threshold with hysteresis, the integer + type is used for counter thresholds and the float type for gauge thresholds."; } @@ -586,6 +587,18 @@ module _3gpp-common-fm { min-elements 1; } } + + leaf clearingType { + type enumeration { + enum AUTOMATIC; + enum MANUAL; + } + config false; + default AUTOMATIC; + description "Indicates whether the alarm needs + to be cleared manually by the MnS consumer (ADMC) + or the producer will clear it automatically (ADAC)."; + } } grouping AlarmListGrp { @@ -665,11 +678,15 @@ module _3gpp-common-fm { name-containing the AlarmList, and the base object itself. AlarmList instances are created by the system or are pre-installed. - They cannot be created nor deleted by MnS consumers. + They can neighter be created nor deleted by MnS consumers. When the alarm list is locked or disabled, the existing alarm records - are not updated, and new alarm records are not added to the alarm list"; - + are not updated, and new alarm records are not added to the alarm list + + As the size of the alarm list is finite, if it becomes full, the + producer may remove the oldest list entries in alarmRecords. If there + are cleared but unacknowledged alarms these shall be removed before any + not-cleared alarms are removed."; uses top3gpp:Top_Grp ; container attributes {