Commit f5ecd304 authored by lengyelb's avatar lengyelb
Browse files

Merge branch '28.111_Rel18_Add_missing_attribute_unreliableAlarmScope_YANG'... 

Merge branch '28.111_Rel18_Add_missing_attribute_unreliableAlarmScope_YANG' into 'Integration_Rel18_SA5_155_YANG'

28.111_Rel18_Add_missing_attribute_unreliableAlarmScope_YANG into Integration_Rel18_SA5_155_YANG

See merge request !1175
parents fe52fd6b 8648723a

yang-models/_3gpp-common-fm.yang

+61 −2
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ module _3gpp-common-fm { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.111";



  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 {
@@ -94,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
@@ -347,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 ;
@@ -432,7 +476,7 @@ module _3gpp-common-fm { 
        type types3gpp:DistinguishedName;

      }

      

      leaf-list notificationId {

      leaf-list notificationIds {

        type int32;

        min-elements 1;

      }
@@ -480,6 +524,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 {