From 7972b43792e5e75c5759511cdbf7ddb8c63ef6ea Mon Sep 17 00:00:00 2001
From: lengyelb <balazs.lengyel@ericsson.com>
Date: Thu, 16 May 2024 08:49:56 +0000
Subject: [PATCH 1/4] Added missing attribute unreliableAlarmScope  and
 corrected name of corelatedNotifications.notificationIds

---
 yang-models/_3gpp-common-fm.yang | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index c0c1a8d08..70287588a 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -432,7 +432,7 @@ module _3gpp-common-fm {
         type types3gpp:DistinguishedName;
       }
       
-      leaf-list notificationId {
+      leaf-list notificationIds {
         type int32;
         min-elements 1;
       }
@@ -480,6 +480,21 @@ module _3gpp-common-fm {
       yext3gpp:notNotifyable;
       uses AlarmRecordGrp;
     }
+
+    leaf-list unreliableAlarmScope {
+      type types3gpp:DistinguishedName;
+      config false;
+      yext3gpp:notNotifyable;
+      description "Identifies, the part of the alarm scope that may not be 
+        reliable.
+
+        If this parameter is equal to the instance carried in systemDN, 
+        then all AlarmRecord instances in the AlarmList may not be reliable.
+
+        If this parameter is equal to some instance represented by 
+        MonitoredEntity, then only AlarmRecord related to this instance and 
+        its descendants may not be reliable.";
+    }
   }
 
   grouping FmSubtree {
-- 
GitLab


From 6662c66b5d2748b40f8c64ed89bb192dd67b0322 Mon Sep 17 00:00:00 2001
From: lengyelb <balazs.lengyel@ericsson.com>
Date: Thu, 16 May 2024 08:56:07 +0000
Subject: [PATCH 2/4] Added dummy revision statement

---
 yang-models/_3gpp-common-fm.yang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index 70287588a..95200768f 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 2024-05-12 { reference CR-0xxx ; } 
   revision 2024-03-06 { reference CR-0333 ; } 
   revision 2024-02-24 { reference CR-0346; } 
   revision 2024-01-18 {
@@ -529,4 +530,4 @@ module _3gpp-common-fm {
     }
   }
 
-}
\ No newline at end of file
+}
-- 
GitLab


From e2a65e139e3d3aeea4887b542cc8d333a2623bb5 Mon Sep 17 00:00:00 2001
From: lengyelb <balazs.lengyel@ericsson.com>
Date: Wed, 22 May 2024 13:20:21 +0000
Subject: [PATCH 3/4] Update _3gpp-common-fm.yang - updated revision statement

---
 yang-models/_3gpp-common-fm.yang | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index 95200768f..1d7c76f0b 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -16,7 +16,10 @@ module _3gpp-common-fm {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.111";
 
-  revision 2024-05-12 { reference CR-0xxx ; } 
+  revision 2024-05-12 { 
+    description "The definition of the module was from TS 28.623 to TS 28.111";
+    reference CR-0008 ; 
+  } 
   revision 2024-03-06 { reference CR-0333 ; } 
   revision 2024-02-24 { reference CR-0346; } 
   revision 2024-01-18 {
-- 
GitLab


From 8648723a61e2456e8daf9db106ad945b992e9a60 Mon Sep 17 00:00:00 2001
From: lengyelb <balazs.lengyel@ericsson.com>
Date: Wed, 22 May 2024 13:25:41 +0000
Subject: [PATCH 4/4] Update _3gpp-common-fm.yang - Added comments to
 alarmrecord

---
 yang-models/_3gpp-common-fm.yang | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index 1d7c76f0b..223ea0033 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -98,6 +98,36 @@ module _3gpp-common-fm {
     description "The possible alarm severities";
   }
 
+  grouping AlarmCommentGrp {
+    leaf commentTime {
+      type yang:date-and-time;
+      config false;
+      mandatory true;
+      description "Date and Time the comment was created.";
+    }
+
+    leaf commentUserId {
+      type string;
+      mandatory true;
+      description "It carries the identification of the user who made the
+        comment.";
+    }
+
+    leaf commentSystemId {
+      type string;
+      mandatory true;
+      description "It carries the identification of the system (
+        Management System) from which the comment is made. That system
+        supports the user that made the comment.";
+    }
+
+    leaf commentText {
+      type string;
+      mandatory true;
+      description "It carries the textual comment.";
+    }
+  }
+
   grouping AlarmRecordGrp {
     description "Contains alarm information of an alarmed object instance.
       A new record is created in the alarm list when an alarmed object
@@ -351,6 +381,16 @@ module _3gpp-common-fm {
       yext3gpp:notNotifyable;
     }
 
+    list comments {
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      description "List of comments and data about the comments.";
+      key idx;
+      leaf idx { type uint32; }
+
+      uses AlarmCommentGrp;
+    }
+
     leaf ackTime  {
       if-feature AcknowledgeByConsumer;
       type yang:date-and-time ;
-- 
GitLab