Commit c6c5b865 authored by rosabolzek's avatar rosabolzek Committed by lengyelb
Browse files

move udrinfo from nfprofile to _3gpp-5gc-nrm-udrfunction and correct error

parent 99fe3b9d

yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang

+20 −3
Original line number Diff line number Diff line 
module _3gpp-5gc-nrm-managed-nfprofile {

  yang-version 1.1;

  

  namespace urn:_3gpp-5gc-nrm-managed-nfprofile;

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

  prefix mnfp3gpp;

  

  import _3gpp-common-yang-types { prefix types3gpp; }
@@ -117,6 +117,8 @@ TTA, TTC). All rights reserved."; 
            description "It represents a set of SUPIs for which 

                the NF (Service) instance under CANARY_RELEASE status shall

                 be selected.";

            key idx; 

            leaf idx { type uint32; }

            uses SupiRange;

        }

        list gpsiRangeList {
@@ -124,6 +126,8 @@ TTA, TTC). All rights reserved."; 
                (Service)

                instance under CANARY_RELEASE status shall be selected";

            min-elements 1;

            key idx; 

            leaf idx { type uint32; }

            uses IdentityRange;

        }

        list impuRangeList {
@@ -131,6 +135,8 @@ TTA, TTC). All rights reserved."; 
                for which the NF (Service) instance under CANARY_RELEASE

                 status shall be selected";

            min-elements 1;

            key idx; 

            leaf idx { type uint32; }

            uses IdentityRange;

        }

        list impiRangeList {
@@ -138,6 +144,8 @@ TTA, TTC). All rights reserved."; 
                for which theNF (Service) instance under 

                CANARY_RELEASE status shall be selected.";

            min-elements 1;

            key idx; 

            leaf idx { type uint32; }

            uses IdentityRange;

        }

        leaf peiList {
@@ -175,9 +183,17 @@ TTA, TTC). All rights reserved."; 
            description "The specific list of S-NSSAIs supported 

            by the given PLMN.";

            min-elements 1;

            max-elements 1;

            key "sst sd";

            uses types5g3gpp:SNssai;

        }

        leaf nid { 

            description "Network Identity; Shall be present if PlmnIdNid

            identifies an SNPN ";

            reference "see clauses 5.30.2.3, 5.30.2.9, 6.3.4, 

            and 6.3.8 in 3GPP TS 23.501 ";

            type string;

        }

    }



    grouping ConditionGroupGrp {
@@ -348,7 +364,7 @@ grouping ManagedNFProfileGrp { 
       at least one NF Service, the S-NSSAIs supported per PLMN in the 

       NF Profile shall be the set or a superset of the perPlmnSnssaiList

       of the NFService(s).";

      key "mcc mnc nId"; 

      key idx;

      leaf idx { type uint32; }

      uses PlmnSnssai;

    }
@@ -358,7 +374,7 @@ grouping ManagedNFProfileGrp { 
      The absence of this attribute in the NF profile indicates that no SNPN, 

      other than the SNPN(s) registered in the snpnList attribute of the 

      NF Profile, is allowed to access the service instance";

      key "mcc mnc";

      key "mCC mNC";

      uses nfs3gpp:SNPNIdGrp;

    }
@@ -571,6 +587,7 @@ grouping ManagedNFProfileGrp { 
    list selectionConditions {

      description "Identifications of Credentials Holder or Default Credentials

      Server. It is an array of FQDN.";

      leaf idx { type uint32; }

      key "idx";

      uses SelectionConditionsGrp;

    }

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

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

  import ietf-inet-types { prefix inet; }

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

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

  import _3gpp-common-top { prefix top3gpp; }

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

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

  

  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -70,17 +70,12 @@ module _3gpp-5gc-nrm-nrffunction { 
      uses types5g3gpp:SNssai;

    }

    

    list nFProfileList {

      description "Set of NFProfile(s) to be registered in the NRF instance.";

      //optional support

      key nfInstanceId;

      uses nfp3gpp:NFProfileGrp;

    }

    list managedNFProfile {

      key idx;

      leaf idx { type uint32; }

      min-elements 1;

      max-elements 1;

      uses types3gpp:ManagedNFProfile;

      uses mnfp3gpp:ManagedNFProfileGrp;

      description "This parameter defines profile for managed NF";

      reference "3gpp TS 23.501";

    }

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

+57 −4
Original line number Diff line number Diff line
@@ -10,15 +10,17 @@ module _3gpp-5gc-nrm-udrfunction { 
  import _3gpp-common-yang-types { prefix types3gpp; }

  import _3gpp-common-top { prefix top3gpp; }

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

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



  organization "3gpp SA5";

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

  description "This IOC represents the UDR function in 5GC. For more information 

    about the UDR, see 3GPP TS 23.501.

    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-07-25 { reference CR-1558 ; } 

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

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

  revision 2020-11-08 { reference CR-0412 ; }
@@ -26,6 +28,47 @@ module _3gpp-5gc-nrm-udrfunction { 
    

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



    grouping udrInfo {

      

      leaf groupId {

        description "Identity of the UDR group that is served

         by the UDR instance.

          If not provided, the UDR instance does not pertain

           to any UDR group.";

        type string;

      }

      

      list supiRanges {

        description "List of ranges of SUPI's whose profile data

         is available in the UDR instance.";

        key "start end pattern";

        min-elements 1;

        uses mnfp3gpp:SupiRange;

      }

      

      list gpsiRanges {

        description "List of ranges of GPSIs whose profile data is

         available in the UDR instance.";

        key "start end pattern";

        min-elements 1;

        uses mnfp3gpp:IdentityRange;

      }

      

      list externalGroupIdentifiersRanges {

        description "List of ranges of external groups whose profile

         data is available in the UDR instance.";

        key "start end pattern";

        min-elements 1;

        uses mnfp3gpp:IdentityRange;

      }

      

      leaf-list supportedDataSets {

        description "List of supported data sets in the UDR instance.

                     If not provided, the UDR supports all data sets.";

        min-elements 1;

        type DataSetId;

      }

    }  

  grouping UDRFuntionGrp {

    description "Representse the UDRFuntion IOC";

    uses mf3gpp:ManagedFunctionGrp;
@@ -61,10 +104,20 @@ module _3gpp-5gc-nrm-udrfunction { 
    

    list managedNFProfile {

      key idx;

      leaf idx { type uint32; }

      min-elements 1;

      max-elements 1;

      description "Profile definition of a Managed NF (See TS 23.501)";

      uses types3gpp:ManagedNFProfile;

      uses mnfp3gpp:ManagedNFProfileGrp;

    }

  }

  

  typedef DataSetId {

    type enumeration {

      enum SUBSCRIPTION;

      enum POLICY;

      enum EXPOSURE;

      enum APPLICATION;

    }

  }