Commit e9db5a1a authored by mouqueta's avatar mouqueta
Browse files

Merge branch 'Integration_Rel19_SA5_162_YANG' into 'Rel-20' 

Integration_Rel19_SA5_162_YANG into Rel-20

See merge request !1896
parents 47cb85aa e9236ea9

yang-models/_3gpp-5g-common-yang-types.yang

+189 −72
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ module _3gpp-5g-common-yang-types { 
  prefix "types5g3gpp";



  import ietf-yang-types { prefix yang; }

  import ietf-inet-types { prefix inet; }

  import _3gpp-common-yang-types { prefix types3gpp; }



  organization "3GPP SA5";
@@ -14,6 +15,7 @@ module _3gpp-5g-common-yang-types { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



  revision 2025-07-25 { reference CR-1558 ; }

  revision 2025-03-25 { reference CR-1489 ; }

  revision 2024-11-01 { reference CR-1405; }

  revision 2024-10-06 { reference CR-1389; }
@@ -24,6 +26,106 @@ module _3gpp-5g-common-yang-types { 
  revision 2020-11-05 { reference CR-0412 ; }

  revision 2019-10-20 { reference "Initial version."; }



  grouping IpInterfaceGrp {

    leaf-list ipv4EndpointAddresses {

      description "Available endpoint IPv4 address(es) of

        the User Plane interface.";

      type inet:ipv4-address;

      must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn';

    }



    leaf-list ipv6EndpointAddresses {

      description "Available endpoint IPv6 address(es) of

        the User Plane interface.";

      type inet:ipv6-address;

      must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn';

      }



    leaf fqdn {

      description "This parameter defines FQDN of the Network Function

        (See TS 23.003).";

      type inet:domain-name;

      must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn';

      }

  }



  grouping SdRangeGrp {

    leaf start {

      type string {

         pattern "[A-Fa-f0-9]{6}";

       }

      mandatory true;

      description "First value identifying the start of an SD range.

        This string shall be formatted as specified for the sd attribute of the

        Snssai data type in clause 5.4.4.2 of TS 29.571.";

    }



    leaf end {

      type string {

         pattern "[A-Fa-f0-9]{6}";

       }

      mandatory true;

      description "Last value identifying the end of an SD range.

      This string shall be formatted as specified for the sd attribute of the

        Snssai data type in clause 5.4.4.2 in TS 29.571";

    }

  }



  grouping SnssaiExtensionGrp {

    list sdRanges {

      min-elements 1;

      key "start end";

      description "It shall contain the range(s) of Slice Differentiator values

        supported for the Slice/Service Type value indicated in the sst

        attribute of the Snssai data type (see clause 5.4.4.2 in TS 29.571).";

      uses SdRangeGrp;

    }



    leaf wildcardSd {

      type boolean;

      default false;

      description "It indicates that all SD values are supported for the

        Slice/Service Type value indicated in the sst attribute of the Snssai

        data type (see clause 5.4.4.2 in TS 29.571).";

    }

  }



  grouping ExtSnssaiGrp {

    list snssai {

      description "It represents the S-NSSAI the NetworkSlice managed object

        is supporting. The S-NSSAI is defined in TS 23.003 ";

      min-elements 1;

      max-elements 1;

      key "sd sst";

      uses SNssai;

    }



    list snssaiExtension {

      description "It represents extensions to the Snssai.";

      min-elements 1;

      key idx;

      leaf idx { type uint32; }

      uses SnssaiExtensionGrp;

    }

  }

    grouping sNssaiSmfInfoItem {

    list sNssai {

      description "Supported S-NSSAI.";

      min-elements 1;

      max-elements 1;

      key "sst sd";

      uses types5g3gpp:SNssai;

    }



    list dnnSmfInfoList {

      description "List of parameters supported by the SMF per DNN.

      The absence indicates the DNN can be selected for any DNAI.";

      min-elements 1;

      key dnn;

      uses DnnSmfInfoItem;

    }

  }



  grouping MappedCellIdInfoGrp {

    description "This data type represents the mapping relationship between

      Mapped Cell IDs and geographical areas (see clause 16.14.5 of TS 38.300";
@@ -237,6 +339,21 @@ module _3gpp-5g-common-yang-types { 
      type string;

    }

  }

    grouping DnnSmfInfoItem {

    leaf dnn {

      description "Supported DNN.";

      mandatory true;

      type string;

    }



    leaf-list dnaiList {

      description "List of Data network access identifiers supported by

      the SMF for this DNN. The absence of this attribute indicates that

       the SMF can be selected for this DNN for any DNAI.";

      min-elements 1;

      type string;

    }

  }



  grouping SupportedFunc {

    leaf function {

yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang

+14 −12
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { 
  yang-version 1.1;



  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-FiveQiDscpMappingSet;

  prefix FiveQiDscpMapping3gpp;

  prefix FiveQiDscpM3gpp;



  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }
@@ -15,6 +15,8 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";





  revision 2025-07-25 { reference CR-1558 ; }

  revision 2025-01-25 { reference CR-1442 ; }

  revision 2023-09-18 { reference CR-1043 ; }

  revision 2020-08-03 { reference "CR-0321"; }

yang-models/_3gpp-5gc-nrm-amffunction.yang

+132 −127
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ module _3gpp-5gc-nrm-amffunction { 
  import ietf-yang-types { prefix yang; }

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; }

  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp;}





  organization "3gpp SA5";
@@ -20,6 +21,7 @@ module _3gpp-5gc-nrm-amffunction { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";



  revision 2025-07-25 { reference CR-1558 ; }

  revision 2025-03-25 { reference "CR-1489 CR-1512" ; }

  revision 2024-11-01 { reference CR-1405; }

  revision 2024-10-06 { reference CR-1389; }
@@ -470,9 +472,11 @@ module _3gpp-5gc-nrm-amffunction { 
      uses types5g3gpp:PLMNInfo;

    }



    container aMFIdentifier {

    list aMFIdentifier {

      description "An AMF identifier, comprising an AMF Region ID, an

        AMF Set ID and an AMF Pointer.";

        key idx;

        leaf idx { type uint32; }

      uses types3gpp:AmfIdentifier;

    }
@@ -494,9 +498,10 @@ module _3gpp-5gc-nrm-amffunction { 


    list managedNFProfile {

      key idx;

      leaf idx{ type uint32;}

      min-elements 1;

      max-elements 1;

      uses types3gpp:ManagedNFProfile;

      uses mnfp3gpp:ManagedNFProfileGrp;

      description "";

    }

yang-models/_3gpp-5gc-nrm-ausffunction.yang

+47 −46
Original line number Diff line number Diff line
@@ -8,10 +8,9 @@ module _3gpp-5gc-nrm-ausffunction { 
  import _3gpp-common-managed-element { prefix me3gpp; }

  import ietf-inet-types { prefix inet; }

  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }

  import _3gpp-common-yang-types { prefix types3gpp; }

  import _3gpp-common-yang-extensions { prefix yext3gpp; }

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }

  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }



  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -55,7 +54,6 @@ module _3gpp-5gc-nrm-ausffunction { 


    leaf nFSrvGroupId {

      type string;

      mandatory false;

      config false;

      yext3gpp:inVariant;

      yext3gpp:notNotifyable;
@@ -68,7 +66,7 @@ module _3gpp-5gc-nrm-ausffunction { 
        by the PCF instance.";

      key idx;

      leaf idx { type uint32 ; }

      uses nfp3gpp:SupiRange;

      uses mnfp3gpp:SupiRangeGrp;

    }



      leaf-list routingIndicators {
@@ -115,10 +113,13 @@ module _3gpp-5gc-nrm-ausffunction { 
    }



    list managedNFProfile {

      description "This data type represents a Profile definition

      of a Managed NF";

      key idx;

      leaf idx { type uint32 ; }

      min-elements 1;

      max-elements 1;

      uses types3gpp:ManagedNFProfile;

      uses mnfp3gpp:ManagedNFProfileGrp;

    }



    list commModelList {

yang-models/_3gpp-5gc-nrm-dnfunction.yang

+12 −12
Original line number Diff line number Diff line 
module _3gpp-5gc-nrm-dnfunction {

  yang-version 1.1;



  namespace urn:3gpp:sa5_3gpp-5gc-nrm-dnfunction;

  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-dnfunction;

  prefix dn3gpp;



  import _3gpp-common-managed-function { prefix mf3gpp; }
@@ -9,6 +9,7 @@ module _3gpp-5gc-nrm-dnfunction { 
  import _3gpp-common-top { prefix top3gpp; }



  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "This IOC is defined only to describe the IOCs representing

               Data Network (DN) interaction interface with 5GC (i.e. EP_N6).

               It has no attributes defined.
@@ -16,12 +17,11 @@ module _3gpp-5gc-nrm-dnfunction { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



  revision 2025-07-25 { reference CR-1552 ; }

  revision 2023-09-18 { reference CR-1043 ; }

  revision 2019-10-28 { reference S5-193518 ; }



  revision 2019-05-15 {

    description "initial revision";

  }

  revision 2019-05-15 { reference "initial revision"; }



  grouping DNFunctionGrp {

    uses mf3gpp:ManagedFunctionGrp;