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

move nrf udr and smf from nfprofile

parent 604dbe1c
Loading
Loading
Loading
Loading
+268 −2
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ module _3gpp-5gc-nrm-nrffunction {
  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
  
  import _3gpp-5gc-nrm-udrfunction { prefix udr3gpp; }
  import _3gpp-5gc-nrm-udmfunction { prefix udm3gpp; }
  import _3gpp-5gc-nrm-ausffunction { prefix ausf3gpp; }
  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "This IOC represents the NRF function in 5GC.
@@ -28,6 +30,254 @@ module _3gpp-5gc-nrm-nrffunction {
  revision 2019-10-28 { reference S5-193518 ; }
  revision 2019-05-15 { reference "initial revision"; }
  
    grouping NrfInfoGrp {
      
      list servedUdrInfo {
        description "This attribute contains all the udrInfo 
        attributes 
        locally configured in the NRF or the NRF received 
        during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses udr3gpp:UdrInfoGrp;
      }
      
      list servedUdmInfo {
        description "This attribute contains all the udmInfo
         attributes
         locally configured in the NRF or the NRF 
         received during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses udm3gpp:UdmInfoGrp;
      }
      
      list servedAusfInfo {
        description "This attribute contains all the
         ausfInfo attributes
         locally configured in the NRF or the NRF
          received during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses AusfInfoGrp;
      }
      
      list servedAmfInfo {
        description "This attribute contains all the amfInfo
         attributes
         locally configured in the NRF or the NRF received
          during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses amfInfo;
      }
      
      list servedSmfInfo {
        description "This attribute contains all the smfInfo
         attributes
         locally configured in the NRF or the NRF received
          during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses SmfInfoGrp;
      }
      
      list servedUpfInfo {
        description "This attribute contains all the upfInfo
         attributes
         locally configured in the NRF or the NRF received
          during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses upfInfo;
      }
      
      list servedPcfInfo {
       description "This attribute contains all the pcfInfo
        attributes
        locally configured in the NRF or the NRF received
         during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses pcfInfo;
      }
      
      list servedBsfInfo {
       description "This attribute contains all the bsfInfo
        attributes
        locally configured in the NRF or the NRF received
         during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId{
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses bsfInfo;
      }
      
      list servedChfInfo {
        description "This attribute contains all the bsfInfo
         attributes
         locally configured in the NRF or the NRF received
          during NF registration.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses chfInfo;
      }

      list servedNwdafInfo {
        description "This attribute contains all the nwdafInfo attributes
         locally configured in the NRF or the NRF received during NF 
         registration. The key of the map is the nfInstanceId of which 
         the nwdafInfo belongs to.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses nwdaf3gpp:NwdafInfoGrp;
      } 
      list servedPcscfInfoList {
        description "This attribute contains all the pcscfInfo attributes
         locally configured in the NRF or the NRF received during NF
         registration. The key of the map is the nfInstanceId to which
         the map entry belongs to.";
        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses pcscfInfo;
      }
      list servedGmlcInfo {
        description "This attribute contains all the gmlcInfo attributes 
        locally configured in the NRF or the NRF received during NF 
        registration. The key of the map is the nfInstanceId of which 
        the nefInfo belongs to.";        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses gmlc3gpp:GmlcInfoGrp;
      }
      list servedLmfInfo {
        description "This attribute contains all the lmfInfo attributes 
        locally configured in the NRF or the NRF received during NF 
        registration. The key of the map is the nfInstanceId of which 
        the lmfInfo belongs to.";        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses lmf3gpp:LmfInfoGrp;
      }
      list servedNfInfo {
        description "This attribute contains information of other NFs 
        without corresponding NF type specific Info extensions locally 
        configured in the NRF or the NRF received during NF registration. 
        The key of the map is the nfInstanceId of the NF. The map entry 
        is the NfInfo as defined in clause 5.3.229 representing the 
        information of a generic NF instance.";        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        
        min-elements 1;
        uses nfInfoGrp;
      }
      list servedHssInfoList {
        description "This attribute contains list of HssInfo attribute
        locally configured in the NRF or that the NRF received during NF
        registration. The key of the map is the nfInstanceId to which the
        map entry belongs to.";        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        min-elements 1;
        uses HssInfoGrp;
      } 
     list served5gDdnmfInfo {
        description "This attribute contains all the 5gDdnmfInfo
        attribute locally configured in the NRF or that the NRF 
        received during NF registration. The key of the map is 
        the nfInstanceId to which the map entry belongs to.";        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        min-elements 1;
        uses FiveGDdnmfInfo ;
      }                           
    }

  grouping NRFFunctionGrp {
    description "Represents the NRFFunction IOC";
    uses mf3gpp:ManagedFunctionGrp;
@@ -69,7 +319,23 @@ module _3gpp-5gc-nrm-nrffunction {
      key "sd sst";
      uses types5g3gpp:SNssai;
    }
    
    list nrfInfo {
      description "";
      key idx;
      leaf idx {type uint32;}
      uses NrfInfoGrp;
    }
    list nFProfileList {
      description "It is a set of NFProfile(s) to be registered in the NRF 
      instance. NFProfile is defined in 3GPP TS 29.510 ";
      key idx;
      leaf idx { type uint32; }
      min-elements 1;
      max-elements 1;
      uses mnfp3gpp:ManagedNFProfileGrp;
      description "This parameter defines profile for managed NF";
      reference "3gpp TS 23.501";
    }    
    list managedNFProfile {
      key idx;
      leaf idx { type uint32; }
+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ module _3gpp-5gc-nrm-smffunction {
  revision 2018-08-07 { reference "Initial revision";}


    grouping smfInfo {
    grouping SmfInfoGrp {
      
      list sNssaiSmfInfoList {
        description "List of parameters supported by the SMF per S-NSSAI.";
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ module _3gpp-5gc-nrm-udrfunction {
    
  revision 2019-05-22 {reference "initial revision"; }

    grouping udrInfo {
    grouping UdrInfoGrp {
      
      leaf groupId {
        description "Identity of the UDR group that is served