Commit d6d31f3e authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel18_SA5_150_YANG' into 'Rel-18' 

R18 YANG updates after SA#101 and SA5#150

See merge request !747
parents 6be819d5 190564e5

yang-models/_3gpp-common-managed-element.yang

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ module _3gpp-common-managed-element { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";



  revision 2023-08-10 { reference CR-0257;   }

  revision 2023-04-26 { reference CR-0250; }

  revision 2023-02-14 { reference "CR-0234"; }

  revision 2022-09-30 { reference "CR-0191"; }
@@ -61,6 +62,11 @@ module _3gpp-common-managed-element { 
      ManagedElement";

  }



  feature SupportedNotificationsUnderManagedElement {

    description "The SupportedNotificationsSubtree shall be contained under

      ManagedElement";

  }



  feature FmUnderManagedElement {

    description "The FmSubtree shall be contained under ManagedElement";

  }
@@ -265,6 +271,10 @@ module _3gpp-common-managed-element { 
      if-feature SubscriptionControlUnderManagedElement;

    }

    

    uses subscr3gpp:SupportedNotificationsSubtree {

      if-feature SupportedNotificationsUnderManagedElement;

    }    

    

    uses fm3gpp:FmSubtree {

      if-feature FmUnderManagedElement;

    }

yang-models/_3gpp-common-mnsregistry.yang

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ module _3gpp-common-mnsregistry { 
    Class (IOC) that is part of the Generic Network Resource Model (NRM).";

  reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";



  revision 2023-05-10 { reference CR-0243; }

  revision 2023-02-14 { reference CR-0234; }

  revision 2021-11-23 { reference "S5-216090"; }

  revision 2021-10-18 { reference "S5-215263"; }
@@ -79,6 +80,9 @@ module _3gpp-common-mnsregistry { 
          and provides the data required to support its discovery.

          It is name-contained by MnsRegistry.



          This specification does not specify how 'MnsInfo' objects are 

          created and maintained.

          

          This information is used by the consumer to discover the producers

          of specific Management Services and to derive the addresses of the

          Management Service.

yang-models/_3gpp-common-subnetwork.yang

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ module _3gpp-common-subnetwork { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";

  

  revision 2023-08-10 { reference CR-0257;   }

  revision 2023-04-26 { reference CR-0250; }

  revision 2023-02-14 { reference CR-0234; }

  revision 2022-09-30 { reference CR-0191 ; }
@@ -78,6 +79,11 @@ module _3gpp-common-subnetwork { 
      SubNetwork";

  }



  feature SupportedNotificationsUnderSubNetwork {

    description "The SupportedNotificationsSubtree shall be contained under

      SubNetwork";

  }



  feature FmUnderSubNetwork {

    description "The FmSubtree shall be contained under SubNetwork";

  }
@@ -223,6 +229,10 @@ module _3gpp-common-subnetwork { 
      if-feature SubscriptionControlUnderSubNetwork;

    }



    uses subscr3gpp:SupportedNotificationsSubtree {

      if-feature SupportedNotificationsUnderSubNetwork;

    }



    uses fm3gpp:FmSubtree {

      if-feature FmUnderSubNetwork;

    }

yang-models/_3gpp-common-subscription-control.yang

+93 −29
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ module _3gpp-common-subscription-control { 
      Solution Set (SS) definitions

      3GPP TS 28.623";

  

  revision 2023-08-10 { reference "CR0257 CR0260"; }

  revision 2022-10-20 { reference CR-0196;   }

  revision 2021-01-16 { reference "CR-0120"; }  

  revision 2020-08-26 { reference "CR-0106"; }
@@ -33,7 +34,7 @@ module _3gpp-common-subscription-control { 
      type string;

      description "Defines the types of notifications that are candidates 

        for being forwarded to the notification recipient.

        If the notificationFilter attribute is not supported or not present 

        If the notificationTypes attribute is not supported or not present 

        all candidate notifications types are forwarded to the notification; 

        discriminated by notificationFilter attribute.";

    }
@@ -128,37 +129,58 @@ module _3gpp-common-subscription-control { 
      augment all user classes!";



    list NtfSubscriptionControl {

      description "A NtfSubscriptionControl instance represents the 

        notification subscription of a particular notification recipient.

        The scope attribute is used to select managed object instances. 

        The base object instance of the scope is the object instance 

        name-containing the NtfSubscriptionControl instance. 

        The notifications related to the selected managed object instances 

        are candidates to be sent to the address specified by the 

        notificationRecipientAddress attribute.

        The notificationType attribute and notificationFilter attribute 

        allow MnS consumers to exercise control over which candidate 

        notifications are sent to the notificationRecipientAddress.

        If the notificationType attribute is supported and present, its 

        value identifies the 

        types of notifications that are candidate to be sent to the 

        notificationRecipientAddress. If the notificationType attribute is 

        not supported or not present, all types of notifications are 

        candidate to be sent to notificationRecipientAddress.

      description "NtfSubscriptionControl represents a notification 

        subscription of a notification recipient. 

        

        The scope attribute is used to select managed object instances included 

        in the subscription. The base object instance of the scope is the 

        object instance name-containing the NtfSubscriptionControl instance. 

        When the scope attribute is absent, all objects below and including 

        the base object are scoped. The notifications related to the selected 

        managed object instances are candidates to be sent to the address 

        specified by the notificationRecipientAddress attribute.

        

        The notificationTypes attribute and notificationFilter attribute 

        allow MnS consumers to control which candidate notifications are 

        sent to the notificationRecipientAddress.

        

        If the notificationTypes attribute is present, its value identifies 

        the notification types that are candidates to be sent to the 

        notificationRecipientAddress. If the notificationTypes attribute is 

        absent, notifications of all types are candidates to be sent to 

        notificationRecipientAddress. Notification types supported in the 

        NtfSubscriptionControl.notificationTypes attribute are the ones 

        listed in the attribute SupportedNotifications.notificationTypes.

        

        If supported, the notificationFilter attribute defines a filter that 

        is applied to the set of candidate notifications. Only candidate 

        is applied to the set of candidate notifications. The filter is 

        applicable to all parameters of a notification. Only candidate 

        notifications that pass the filter criteria are sent to the 

        notificationRecipientAddress. If the notificationFilter attribute is 

        not supported all candidate notificatios are sent to the 

        absent, all candidate notificatios are sent to the 

        notificationRecipientAddress.

        To receive notifications, a MnS consumer has to create 

        NtfSubscriptionControl object instancess on the MnS producer. 

        A MnS consumer can create a subscription for another MnS consumer 

        since it is not required the notificationRecipientAddress be his own 

        address.

        

        To receive notifications, a MnS consumer has to create a 

        NtfSubscriptionControl instance on the MnS producer. A MnS consumer 

        can create a subscription for another MnS consumer since it is not 

        required the notificationRecipientAddress be his own address.

        

        When a MnS consumer does not wish to receive notifications any more 

        the MnS consumer shall delete the corresponding NtfSubscriptionControl 

        instance.

        

        When a subscription is created and the notification scope inludes 

        the created subscription object and the subscribed notification types 

        include notifications reporting object creation (notifyMOICreation 

        or notifyMOIChanges), the first notification sent related to the 

        new subscription shall report the creation of the 

        NtfSubscriptionControl instance. Likewise, when a subscription is 

        deleted and the notification scope inludes the deleted subscription 

        object and the subscribed notification types include notifications 

        reporting object deletion (notifyMOIDeletion or notifyMOIChanges), 

        the last notification sent related to the subscription shall report 

        the deletion of the NtfSubscriptionControl instance.

        

        Creation and deletion of NtfSubscriptionControl instances by MnS 

        consumers is optional; when not supported, the NtfSubscriptionControl 

        instances may be created and deleted by the system or be
@@ -172,9 +194,8 @@ module _3gpp-common-subscription-control { 
      

      list HeartbeatControl {

        description "MnS consumers (i.e. notification recipients) use heartbeat

          notifications to monitor the communication channels between them and

          data reporting MnS producers emitting notifications such as

          notifyNewAlarm and notifyFileReady.

          notifications to monitor the communication channels between themselves 

          and MnS producers configured to emit notifications.



          A HeartbeatControl instance allows controlling the emission of

          heartbeat notifications by MnS producers. The recipients of heartbeat
@@ -221,4 +242,47 @@ module _3gpp-common-subscription-control { 
      }

    }

  } 

  

  grouping SupportedNotificationsGrp {

    description "Attributes of SupportedNotifications.";

      

    leaf-list notificationTypes {

      type string;

      config false;

      description "List of notification types supported by the MnS producer";

    }

    

    leaf-list notificationProtocols {

      type enumeration {

        enum HTTP;

        enum HTTP_VES_ENCAPS;

      }

      config false;

      min-elements 1;

      description "List of protocols supported for notifications.";

      reference "3GPP TS 28.532";

    }

  }

  

  grouping SupportedNotificationsSubtree {

    description "Contains SupportedNotifications.";



    list SupportedNotifications {

      description "SupportedNotifications represents the notification related 

        capabilities of a MnS producer.  



        The notificationTypes attribute lists notificationTypes supported 

        by the MnSProducer. Specific IOCs can be the source of a specific 

        but not necessary every supported notificationType. 



        The notificationProtocols attribute identifies the notification 

        transport protocols supported by a MnS producer.";

        

      key id;

      uses top3gpp:Top_Grp;

      container attributes {

        uses SupportedNotificationsGrp;

      }

    }

  }   

}
 
 No newline at end of file

yang-models/_3gpp-common-trace.yang

+620 −593

File changed.

Preview size limit exceeded, changes collapsed.