Commit a2da0735 authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'YANG_Corrections_28.111_28.623_28.541_Rel19-SA5-160' into... 

Merge branch 'YANG_Corrections_28.111_28.623_28.541_Rel19-SA5-160' into 'Integration_Rel19_SA5_160_YANG'

YANG_Corrections_28.111_28.623_28.541_Rel19-SA5-160 into Integration

See merge request !1636
parents 234f1d5a 82920df3

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

+46 −1
Original line number Diff line number Diff line
@@ -10,10 +10,11 @@ module _3gpp-5g-common-yang-types { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "The model defines common types for 5G networks and 

    network slicing.

    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

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

  revision 2024-10-06 { reference CR-1389; }

  revision 2024-05-24 { reference CR-1273 ; }
@@ -192,6 +193,50 @@ module _3gpp-5g-common-yang-types { 
      type string;

    }  

  }

  grouping TaiRangeGrp {

    list plmnId {

      description "PLMN ID related to the TacRange.";

      min-elements 1;

      max-elements 1;

      key "mcc mnc";

      uses types3gpp:PLMNId;

    }

    

    list tacRangeList { 

      description "The range of the TACs.";

      min-elements 1;

      key "start end";

      uses TacRange;

    }

  }



  grouping TacRange {

    leaf start {

      description "First value identifying the start of a TAC range, 

      to be used when the range of TAC's can be represented

       as a hexadecimal range (e.g., TAC ranges).";

      type string {

        pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)';

      }

    }

    

    leaf end {

      description "Last value identifying the end of a TAC range, 

      to be used when the range of TAC's can be represented as

       a hexadecimal range (e.g. TAC ranges).";

      type string {

        pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$';

      }

    }

    

    leaf nRTACpattern {

      description "Pattern (regular expression according to the ECMA-262) 

        representing the set of TAC's belonging to this range. 

        A TAC value is considered part of the range if and only if the 

        TAC string fully matches the regular expression.";

      type string;

    }

  }  

  

  grouping SupportedFunc {

    leaf function {

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

+4 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ module _3gpp-5gc-nrm-amffunction { 
  import ietf-inet-types { prefix inet; }

  import ietf-yang-types { prefix yang; }

  import _3gpp-common-top { prefix top3gpp; }

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

 



  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -19,6 +19,7 @@ module _3gpp-5gc-nrm-amffunction { 
    TTA, TTC). All rights reserved.";

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



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

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

  revision 2024-10-06 { reference CR-1389; }

  revision 2024-04-04 { reference CR-1139; }
@@ -392,7 +393,7 @@ module _3gpp-5gc-nrm-amffunction { 
      description "The range of TAIs.";

      key "idx";

      leaf idx { type uint32 ; }

       uses nfp3gpp:TaiRangeGrp; 

       uses types5g3gpp:TaiRangeGrp; 

    }

    

    list gUAMIdList {

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

+38 −2
Original line number Diff line number Diff line
@@ -6,16 +6,20 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; }

  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }

  import  _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; }

  import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; }

  

  organization "3gpp SA5";

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

  description "This IOC represents the dynamic 5QIs including their QoS 

    characteristics.

    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

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

  revision 2022-07-28 { reference "CR-0770"; }

  revision 2022-01-07 { reference CR-0643; }
@@ -52,11 +56,43 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
    }  

  }

  

  feature Dynamic5QISetUnderSubNetwork {

    description "Dynamic5QISet shall be contained under SubNetwork."; 

  }

  augment "/subnet3gpp:SubNetwork" { 

    if-feature Dynamic5QISetUnderSubNetwork;

    uses Dynamic5QISetSubtree;

  }



  feature Dynamic5QISetUnderManagedElement {

    description "Dynamic5QISet shall be contained under ManagedElement."; 

  }

  augment "/me3gpp:ManagedElement" {

    if-feature Dynamic5QISetUnderManagedElement;

    uses Dynamic5QISetSubtree;

  }

  

  feature Dynamic5QISetUnderGNBDUFunction {

    description "Dynamic5QISet shall be contained under GNBDUFunction."; 

  }

  augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {

    if-feature Dynamic5QISetUnderGNBDUFunction;

    uses Dynamic5QISetSubtree;

  }

  

  feature Dynamic5QISetUnderGNBCUCPFunction {

    description "Dynamic5QISet shall be contained under GNBCUCPFunction.";

  }

  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" {

    if-feature Dynamic5QISetUnderGNBCUCPFunction;  

    uses Dynamic5QISetSubtree;

  }



  feature Dynamic5QISetUnderGNBCUUPFunction {

    description "Dynamic5QISet shall be contained under GNBCUUPFunction."; 

  }

  augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" {

    if-feature Dynamic5QISetUnderGNBCUUPFunction;  

    uses Dynamic5QISetSubtree;

  }

}
 
 No newline at end of file

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

0 → 100644
+114 −0
Original line number Diff line number Diff line 
module _3gpp-5gc-nrm-gmlcfunction {

  yang-version 1.1;

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

  prefix gmlc3gpp;



  import _3gpp-common-managed-function { prefix mf3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }

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

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

  import _3gpp-common-top { prefix top3gpp; }



  organization "3GPP SA5";

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

  description "This module defines the GMLC Function IOC per 3GPP TS 28.541.

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

    revision 2025-03-25 {

    description "Initial revision.";

    reference "3GPP TS 28.541";

  }

  

    grouping GmlcInfoGrp {

    description "Information of a GMLC NF Instance (see TS 29.510, clause 6.1.6.2.41).";



        leaf servingClientTypes {

            description "Identity of the GMLC group that is served by the GMLC instance.";

            type enumeration {

                enum EMERGENCY_SERVICES {

                description "External client for emergency services";

                }

                    enum VALUE_ADDED_SERVICES {

                description "External client for value added services";

                }

                enum PLMN_OPERATOR_SERVICES {

                description "External client for PLMN operator services";

                }

                enum LAWFUL_INTERCEPT_SERVICES {

                description "External client for Lawful Intercept services";

                }

                enum EXTERNAL_CLIENT_FOR_LAWFUL_INTERCEPT_SERVICES {

                description "External client for PLMN Operator Broadcast services";

                }

                enum PLMN_OPERATOR_OM {

                 description "External client for PLMN Operator O&M";

                }

                enum PLMN_OPERATOR_ANONYMOUS_STATISTICS {

                description "External client for PLMN Operator anonymous statistics";

                }

                enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT {

                description "External client for PLMN Operator target MS service support";

                }

            }

            

        }

        leaf gmlcNumbers{

        type string{

        pattern "^[0-9]{5,15}$";

        }

        description "This attribute represents each item of the array

        shall carry an OctetString indicating the ISDN number of the GMLC in

        international number format as described in ITU-T Rec. E.164 [94] and

        shall be encoded as a TBCD-string.";



        }

    }



    grouping GMLCFunctionGrp {

    description "GMLC Function IOC grouping.";

       uses mf3gpp:ManagedFunctionGrp;



        list pLMNInfoList {

          key "idx";

          leaf idx { type uint32; }

          min-elements 1;

          uses types3gpp:PLMNId;

          uses types5g3gpp:SNssai;

        }

        leaf sBIFqdn {

          type string;

          description "FQDN of the registered NF instance in the service-based interface.";

        }

        list managedNFProfile {

        description "This parameter defines profile for managed NF. See TS 23.501";

        key idx;

        min-elements 1;

        uses types3gpp:ManagedNFProfile;

        }

        list commModelList {

          key "groupId";

          min-elements 1;

          uses types5g3gpp:CommModel;

        }

        list gmlcInfo {

          key "idx";

          leaf idx { type uint32; }

          max-elements 1;

          uses GmlcInfoGrp;

        }

    }  

  augment "/me3gpp:ManagedElement" {

    list GMLCFunction {

      description "5G Core LMF Function defined in TS 23.501";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {

        uses GMLCFunctionGrp;

      }

      uses mf3gpp:ManagedFunctionContainedClasses;

    }

  }

}
 
 No newline at end of file

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

+4 −4
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ module _3gpp-5gc-nrm-lmffunction { 
  import _3gpp-common-yang-types { prefix types3gpp; }

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

  import _3gpp-common-top { prefix top3gpp; }

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

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



  organization "3gpp SA5";

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

  description "This IOC represents the LMF function defined in 3GPP TS 23.501.

    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

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

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

  revision 2019-10-25 { reference "S5-194457 S5193518"; }
@@ -125,7 +125,7 @@ module _3gpp-5gc-nrm-lmffunction { 
      min-elements 1;

      key idx;

      leaf idx { type uint32; }

      uses nfp3gpp:TaiRangeGrp;

      uses types5g3gpp:TaiRangeGrp;

    }



    leaf-list supportedGADShapes {