Commit 167be630 authored by cintiarosa's avatar cintiarosa
Browse files

Add and update NFProfile-related YANG models including HssInfoGrp,...

Add and update NFProfile-related YANG models including HssInfoGrp, GmlcFunction, and other fixes foryang validation
parent c1f9fe62
Loading
Loading
Loading
Loading
+45 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ module _3gpp-5g-common-yang-types {
    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 {
+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 {
+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
+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 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";
@@ -19,6 +18,7 @@ module _3gpp-5gc-nrm-lmffunction {
    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 {
+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ module _3gpp-5gc-nrm-neffunction {
    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-01-25 { reference CR-1442 ; } 
  revision 2024-05-18 { reference CR-1273 ; } 
  revision 2024-04-12 { reference CR-1218 ; } 
@@ -164,7 +164,7 @@ module _3gpp-5gc-nrm-neffunction {
      yext3gpp:notNotifyable;
      key idx;
      leaf idx { type uint32 ; }
      uses nfp3gpp:TaiRangeGrp;
      uses types5g3gpp:TaiRangeGrp;
    }
             
    leaf nefId {
Loading