Commit 55883cee authored by rosabolzek's avatar rosabolzek Committed by lengyelb
Browse files

move from nfprofile

parent a81157ae
Loading
Loading
Loading
Loading
+33 −1
Original line number Diff line number Diff line
@@ -106,6 +106,23 @@ module _3gpp-5g-common-yang-types {
      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 
@@ -320,6 +337,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 {
+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ module _3gpp-5gc-nrm-ausffunction {
  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";
@@ -68,7 +68,7 @@ module _3gpp-5gc-nrm-ausffunction {
        by the PCF instance.";
      key idx;
      leaf idx { type uint32 ; }
      uses nfp3gpp:SupiRange;
      uses mnfp3gpp:SupiRange;
    }
    
      leaf-list routingIndicators {
+340 −341

File changed.

Preview size limit exceeded, changes collapsed.

+122 −14
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ module _3gpp-5gc-nrm-smffunction {
  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
  import ietf-inet-types { prefix inet; }
  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }

  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -27,6 +28,117 @@ module _3gpp-5gc-nrm-smffunction {
  revision 2019-05-31 {reference "Ericsson refactoring."; }
  revision 2018-08-07 { reference "Initial revision";}


    grouping smfInfo {
      
      list sNssaiSmfInfoList {
        description "List of parameters supported by the SMF per S-NSSAI.";
        min-elements 1;
        key idx; 
        leaf idx { type uint32; }
        uses types5g3gpp:sNssaiSmfInfoItem;
      }
      
      list taiList {
        description "The list of TAIs the SMF can serve. 
        It may contain the non-3GPP access TAI.
                     The absence of this attribute and the taiRangeList 
                     attribute indicate that
                     the SMF can be selected for any TAI 
                     in the serving network.";
        
        key idx; 
        leaf idx { type uint32; }
        
        min-elements 1;
        uses types3gpp:TaiGrp;
      }
      
      list taiRangeList {
        description "The range of TAIs the SMF can serve. 
        The absence of this attribute and the taiList
                     attribute indicate that the SMF can be selected 
                     for any TAI in the serving network.";
        min-elements 1;
        key idx; 
        leaf idx { type uint32; }
        uses types5g3gpp:TaiRangeGrp;
      }
      
      leaf pgwFqdn {
        description "The FQDN of the PGW if the SMF is a combined SMF/PGW-C.";
        type inet:domain-name;
      }
      leaf-list accessType {
        description "If included, this IE shall contain the access type 
        (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF.
                     If not included, it shall be assumed the both
                      access types are supported.";
        
        min-elements 1;
        max-elements 2;
        type AccessType;
      }
      leaf priority {
        description "This parameter defines Priority (relative to other
         NFs of the same type) in the range of 0-65535, to be used for 
         NF selection; lower values indicate a higher priority. If
         priority is also present in the nfServiceList parameters, 
         those will have precedence over this value ";
         type uint16; 
      }
      leaf-list vsmfSupportInd {
        description "Used by an SMF to explicitly indicate the support of
         V-SMF capability and its preference to be selected as V-SMF.
         When present it indicate whether the V-SMF capability is supported
         by the SMF:
         - true: V-SMF capability supported by the SMF
         - false: V-SMF capability not supported by the SMF.
         When absent the V-SMF capability support of the SMF is not specified.";
         type boolean;

      }
      leaf pgwFqdnList {
        description "When present, this attribute provides additional FQDNs 
        to the FQDN indicated in the pgwFqdn attribute. 
        The pgwFqdnList attribute may be present if the pgwFqdn attribute 
        is present.";
        type string;
      }
      leaf-list ismfSupportInd {
        description "This attribute may be used by an SMF to explicitly 
        indicate the support of I-SMF capability and its preference to be 
        selected as I-SMF. When present, this attribute shall indicate 
        whether the I-SMF capability are supported by the SMF:
        - TRUE: I-SMF capability supported by the SMF
        - FALSE: I-SMF capability not supported by the SMF. Absence of this
        attribute indicates the I-SMF capability support of the SMF is not 
        specified.";
        max-elements 1;
        type boolean;
      }
      leaf-list smfOnboardingCapability {
        description "This attribute indicates the SMF supports SNPN 
        Onboarding capability and User Plane Remote Provisioning. This 
        is used for the case of Onboarding of UEs for SNPNs 
        (see TS 23.501 [2], clauses 5.30.2.10 and 6.2.6.2).
        -	FALSE: SMF does not support SNPN Onboarding;
        -	TRUE: SMF supports SNPN Onboarding.";
        type boolean;
        max-elements 1;
      }
      leaf-list smfUPRPCapability {
        description "This attribute IE indicates the SMF supports User
        Plane Remote Provisioning (UPRP) capability. This is used for 
        the case of Onboarding of UEs for SNPNs , 
        clauses 5.30.2.10 and 6.2.6.2).
        -	FALSE: SMF does not support UPRP;
        - 	TRUE: SMF supports UPRP.";
        reference "see TS 23.501 [2]";
        type boolean;
      }
    }
 
  grouping SMFFunctionGrp {
    description "Represents the SMFFuntion IOC";
    uses mf3gpp:ManagedFunctionGrp;
@@ -39,11 +151,10 @@ module _3gpp-5gc-nrm-smffunction {
      uses types3gpp:PLMNId;
    }

    leaf-list nRTACList {
    leaf nRTACList {
      description "List of Tracking Area Codes (legacy TAC or extended TAC)
      where the represented management function is serving.";
      reference "TS 38.413 clause 9.3.3.10";
      min-elements 1;
      config false;
      type types5g3gpp:NRTAC;
    }
@@ -54,22 +165,13 @@ module _3gpp-5gc-nrm-smffunction {
      type inet:domain-name;
    }
 
    list sNSSAIList {
      description "List of S-NSSAIs the managed object is capable of supporting.
                   (Single Network Slice Selection Assistance Information)
                   An S-NSSAI has an SST (Slice/Service type) and an optional SD
                   (Slice Differentiator) field.";
      reference "3GPP TS 23.003";
      key "sd sst";
      uses types5g3gpp:SNssai;
    }
    
    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;
    }

    list commModelList {
@@ -115,6 +217,12 @@ module _3gpp-5gc-nrm-smffunction {
    }
  }

    typedef AccessType {
    type enumeration {
      enum 3GPP_ACCESS;
      enum NON_3GPP_ACCESS;
    }
  }
  augment "/me3gpp:ManagedElement" {
    list SMFFunction {
      description "5G Core SMF Function";
+117 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ module _3gpp-5gc-nrm-udmfunction {
  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-managed-nfprofile { prefix mnfp3gpp; }
  
  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -26,6 +27,113 @@ module _3gpp-5gc-nrm-udmfunction {
  revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
  revision 2019-05-22 { reference "initial revision";}
  
    grouping InternalGroupIdRangeGrp {

      leaf start {
        description "It indicates first value identifying the start of an 
        identity range, to be used when the range of identities can be
        represented as a consecutive numeric range.";
        type string;
      }

      leaf end{
        description "It indicates last value identifying the end of an
        identity range, to be used when the range of identities can be 
        represented as a consecutive numeric range.";
        type string;        
      }
      leaf pattern {
        description "It indicates pattern (regular expression according 
        to the ECMA-262 dialect [75]) representing the set of identities 
        belonging to this range. An identity value is considered part of 
        the range if and only if the identity string fully matches the 
        regular expression.";
        type string;        
      }
    }
    grouping SuciInfoGrp {
      description "This data type represents SUCI information containing 
        Routing Indicator and Home Network Public Key ID. (See TS 29.510)";
        
      leaf-list routingInds {
        type string;
        min-elements 1;
        description "It indicates served Routing Indicator (see TS 23.003, 
          clause 2.2B). If not provided, the AUSF/UDM 
          can serve any Routing Indicator.";
      }
      
      leaf-list hNwPubKeyIds  {
        type int64;
        min-elements 1;
        description "It indicating served Home Network Public Key 
          (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM 
          can serve any public key.";
      }
    }
    grouping UdmInfoGrp {
      
      leaf groupId {
        description "Identity of the UDM group that is served by the 
        UDM instance. If not provided, the UDM instance does
         not pertain to any UDM group.";
        type string;
      }
      
      list supiRanges {
        description "List of ranges of SUPI's whose profile data is 
        available in the UDM 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 UDM 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 UDM instance.";
        key "start end pattern";
        min-elements 1;
        uses mnfp3gpp:IdentityRange;
      }
      
      leaf-list routingIndicators {
        description "List of Routing Indicator information that allows
         to route network signalling with SUCI
                     to the UDM instance. If not provided, 
                     the UDM can serve any Routing Indicator.
                     Pattern: '^[0-9]{1,4}$'.";
        min-elements 1;
        type string;
      }

      list internalGroupIdentifiersRanges{
        description "It represents list of ranges of Internal Group 
        Identifiers whose profile data is available in the UDM instance.
        If not provided, it does not imply that the UDM supports all 
        internal groups.";
        key idx;
        leaf idx { type uint32; }
        uses InternalGroupIdRangeGrp;
      }
      list suciInfos {
        description "It represents list of SuciInfo. A SUCI that matches
        this information can be served by the UDM .A SUCI that matches
        all attributes of at least one entry in this array shall be 
        considered as a match of this information";
        key idx;
        leaf idx { type uint32; }        
        uses SuciInfoGrp;
      }
    }

  grouping UDMFuntionGrp {
    description "Represents the UDMFuntion IOC";
    uses mf3gpp:ManagedFunctionGrp;
@@ -61,10 +169,11 @@ module _3gpp-5gc-nrm-udmfunction {
    
    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;
    }

    list commModelList {
@@ -76,6 +185,13 @@ module _3gpp-5gc-nrm-udmfunction {
      uses types5g3gpp:CommModel;
    }

    container udmInfo {
      description "This attribute represents the information of an UDM NF
      Instance ";
      reference "TS 29.510 ";
      uses UdmInfoGrp;
    }

    leaf-list mdtUserConsentReqList {
      type enumeration {
        enum M1;