From 4dd90fe90365886894cab642620af2f9da5720c0 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 2 Jul 2025 16:09:36 +0200 Subject: [PATCH 1/3] Edit _3gpp-common-fm.yang added manuallyCleared --- yang-models/_3gpp-common-fm.yang | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index b067ace3f..551d2faaf 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-xxx18 CR-xxx18"; } 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 { @@ -586,6 +587,15 @@ module _3gpp-common-fm { min-elements 1; } } + + leaf manuallyCleared { + type boolean; + config false; + default false; + 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 { -- GitLab From cdf15b7cc9e87297c487301b3e75cf0cf4e6cadd Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 7 Aug 2025 12:03:30 +0200 Subject: [PATCH 2/3] FM, descriptions, crno --- yang-models/_3gpp-common-fm.yang | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 551d2faaf..508f2d596 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,7 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; - revision 2025-07-01 { reference "CR-xxx18 CR-xxx18"; } + 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 { @@ -157,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."; } @@ -675,11 +675,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 { -- GitLab From 660cf19b47bbcc88cde862562273f44a8edb78a1 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 28 Aug 2025 12:26:15 +0200 Subject: [PATCH 3/3] manuallyCleared -> clearingType Edit _3gpp-common-fm.yang --- yang-models/_3gpp-common-fm.yang | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 508f2d596..f6853d59b 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -588,10 +588,13 @@ module _3gpp-common-fm { } } - leaf manuallyCleared { - type boolean; + leaf clearingType { + type enumeration { + enum AUTOMATIC; + enum MANUAL; + } config false; - default 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)."; -- GitLab